[PATCH] emacs: tweak error buffer handling

[Mark Walters]

view-mode-enter changed between emacs 23 and emacs 24: the current
code makes the error buffer disappear in emacs 24 on quitting it (ie
pressing q) but this just kills the buffer without closing the split
window in emacs 23.

This patch makes the error buffer window disappear in emacs 23
too. Since the view-mode-enter function changed we have to test for
version and do the correct thing in each case.
---

This seems to work but I have only tested on 23.4 and 24.2

Best wishes

Mark



 emacs/notmuch-lib.el |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 77a591d..0407f8a 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -324,15 +324,17 @@ the user dismisses it."
 
   (let ((buf (get-buffer-create "*Notmuch errors*")))
     (with-current-buffer buf
-      (view-mode-enter nil #'kill-buffer)
+      (pop-to-buffer buf)
+      (view-mode-enter (when (< emacs-major-version 24)
+			   (cons (selected-window) (cons nil t)))
+		       #'kill-buffer)
       (let ((inhibit-read-only t))
 	(goto-char (point-max))
 	(unless (bobp)
 	  (insert "\n"))
 	(insert msg)
 	(unless (bolp)
-	  (insert "\n"))))
-    (pop-to-buffer buf)))
+	  (insert "\n"))))))
 
 (defun notmuch-check-async-exit-status (proc msg)
   "If PROC exited abnormally, pop up an error buffer and signal an error.
-- 
1.7.9.1