From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 22 Jul 2020 15:11:32 +0000 (-0700)
Subject: emacs: notmuch-search: avoid wiping out buffer-local variables
X-Git-Tag: 0.31_rc0~116
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=f9fbd1ee3bfd679175d88af403752d87a730349f;hp=765ca7bc08f83a3c0f9ebffe58dab03634e45f37

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

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index dd18f2e1..c97997fe 100644
--- 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)