emacs: notmuch-search: avoid wiping out buffer-local variables

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index dd18f2e13666bca5ad50d796586296209691cb08..c97997fef9c48cbee650edbf86b9f6d582d1892f 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -987,7 +987,11 @@ the configured default sort order."
     (if no-display
        (set-buffer buffer)
       (switch-to-buffer buffer))
-    (notmuch-search-mode)
+    ;; avoid wiping out third party buffer-local variables in the case
+    ;; where we're just refreshing or changing the sort order of an
+    ;; existing search results buffer
+    (unless (eq major-mode 'notmuch-search-mode)
+      (notmuch-search-mode))
     ;; Don't track undo information for this buffer
     (set 'buffer-undo-list t)
     (set 'notmuch-search-query-string query)