diff options
| author | tautologyclub <31303355+tautologyclub@users.noreply.github.com> | 2019-08-22 15:51:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 15:51:50 +0200 |
| commit | 7821c08e4fbfa9a42d9546c681f4b79d3cb83d5c (patch) | |
| tree | 830e5ca6298a565d34a8e98aae0ca2bc00cdfe5b | |
| parent | fe971abb6e0142513a8c6e453e9d3b2eac6a3f08 (diff) | |
| parent | a3204b2ccf77a645108f63ccc7e743e5b7bb81fc (diff) | |
Merge pull request #38 from rgiar/master
autoload magit to prevent errors, log future errors once to *Messages*
| -rw-r--r-- | feebleline.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/feebleline.el b/feebleline.el index 2d7d1ce..eea9a09 100644 --- a/feebleline.el +++ b/feebleline.el @@ -58,6 +58,7 @@ ;;; Code: (require 'cl-macs) +(autoload 'magit-get-current-branch "magit") (defun feebleline-git-branch () "Return current git branch, unless file is remote." @@ -92,6 +93,7 @@ (defvar feebleline--home-dir nil) (defvar feebleline--msg-timer) (defvar feebleline--mode-line-format-previous) +(defvar feebleline-last-error-shown nil) (defface feebleline-git-face '((t :foreground "#444444")) "Example face for git branch." @@ -163,12 +165,13 @@ "Some default settings for EMACS < 25." (set-face-attribute 'mode-line nil :height 0.1)) -;; disabled, because we really shouldn't silently fail (defun feebleline--insert-ignore-errors () "Insert stuff into the echo area, ignoring potential errors." (unless (current-message) - (condition-case nil (feebleline--insert) - (error nil)))) + (condition-case err (feebleline--insert) + (error (unless (equal feebleline-last-error-shown err) + (setq feebleline-last-error-shown err) + (message (format "feebleline error: %s" err))))))) (defun feebleline--force-insert () "Insert stuff into the echo area even if it's displaying something." |