From 60f75eea42c7e614e54a9b8f73c8f21867420b5e Mon Sep 17 00:00:00 2001 From: djcb Date: Thu, 30 May 2013 06:16:05 -0700 Subject: [PATCH] * minor --- mu4e/Makefile.am | 2 +- mu4e/mu4e-headers.el | 4 ++-- mu4e/mu4e-utils.el | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mu4e/Makefile.am b/mu4e/Makefile.am index b82e4aea..2c01bb4f 100644 --- a/mu4e/Makefile.am +++ b/mu4e/Makefile.am @@ -44,7 +44,7 @@ dist_lisp_LISP= \ org-mu4e.el mu4e-about.el: mu4e-about.org - @echo ";; auto-generated" > mu4e-about.el + @echo ";; auto-generated" > qmu4e-about.el @echo "(defconst mu4e-about \"" >> mu4e-about.el @sed 's/"/\\"/g' < mu4e-about.org >> mu4e-about.el @echo "\" \"About mu4e.\")" >> mu4e-about.el diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el index 37c5c91a..2d5ba35d 100644 --- a/mu4e/mu4e-headers.el +++ b/mu4e/mu4e-headers.el @@ -934,8 +934,8 @@ header." (save-excursion (goto-char (point-min)) (while (search-forward mu4e~headers-docid-pre nil t) - ;; not really sure why we need to jump to bol; we we need - ;; to, otherwise we miss lines sometimes... + ;; not really sure why we need to jump to bol; we do need to, otherwise we + ;; miss lines sometimes... (let ((msg (get-text-property (line-beginning-position) 'msg))) (when msg (funcall func msg)))))) diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el index e4df8346..0b8e7056 100644 --- a/mu4e/mu4e-utils.el +++ b/mu4e/mu4e-utils.el @@ -174,10 +174,10 @@ an absolute path." (defun mu4e-message (frm &rest args) "Like `message', but prefixed with mu4e. -If we're waiting for user-input, don't show anything." - (unless (active-minibuffer-window) - (message "%s" (apply 'mu4e-format frm args)) - nil)) +If we're waiting for user-input or if there's some message in the +echo area, don't show anything." + (unless (or (active-minibuffer-window) (current-message)) + (message "%s" (apply 'mu4e-format frm args)))) (defun mu4e-error (frm &rest args) "Create [mu4e]-prefixed error based on format FRM and ARGS.