From 0230d6e403308c6931a21c9d3485ff5dce167366 Mon Sep 17 00:00:00 2001 From: Rob Giardina Date: Sun, 30 Jun 2019 14:17:55 -0400 Subject: autoload magit if needed --- feebleline.el | 1 + 1 file changed, 1 insertion(+) (limited to 'feebleline.el') diff --git a/feebleline.el b/feebleline.el index 6fbdebd..5ca1107 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." -- cgit v1.2.3 From a3204b2ccf77a645108f63ccc7e743e5b7bb81fc Mon Sep 17 00:00:00 2001 From: Rob Giardina Date: Sun, 30 Jun 2019 14:18:10 -0400 Subject: display errors inserting modeline info, once --- feebleline.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'feebleline.el') diff --git a/feebleline.el b/feebleline.el index 5ca1107..64061f0 100644 --- a/feebleline.el +++ b/feebleline.el @@ -93,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." @@ -164,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." -- cgit v1.2.3