emacs: define a few variables as automatically buffer-local

Define these variables as automatically buffer-local, meaning that
they always become buffer-local when set unless explicitly told
otherwise using `setq-default' or when using the Custom interface.

Previously they were declared, which keeps the byte-compiler quiet but
is not actually the same as being defined.  `notmuch-search-mode' then
made them buffer-local in the current buffer and then set the local
values.  This works but is not kosher.

The definitions of the three non-option variables have to be moved up
a bit to enable the change in the next commit, which see.
This commit is contained in:
Jonas Bernoulli 2021-01-10 15:01:03 +01:00 committed by David Bremner
parent b614ea7563
commit 42d32713be
2 changed files with 7 additions and 10 deletions

View file

@ -101,6 +101,7 @@ search results. Note that any filtered searches created by
search." search."
:type 'boolean :type 'boolean
:group 'notmuch-search) :group 'notmuch-search)
(make-variable-buffer-local 'notmuch-search-oldest-first)
(defcustom notmuch-poll-script nil (defcustom notmuch-poll-script nil
"[Deprecated] Command to run to incorporate new mail into the notmuch database. "[Deprecated] Command to run to incorporate new mail into the notmuch database.

View file

@ -205,6 +205,12 @@ there will be called at other points of notmuch execution."
map) map)
"Keymap for \"notmuch search\" buffers.") "Keymap for \"notmuch search\" buffers.")
;;; Internal Variables
(defvar-local notmuch-search-query-string nil)
(defvar-local notmuch-search-target-thread nil)
(defvar-local notmuch-search-target-line nil)
;;; Stashing ;;; Stashing
(defvar notmuch-search-stash-map (defvar notmuch-search-stash-map
@ -226,12 +232,6 @@ there will be called at other points of notmuch execution."
(interactive) (interactive)
(notmuch-common-do-stash (notmuch-search-get-query))) (notmuch-common-do-stash (notmuch-search-get-query)))
;;; Variables
(defvar notmuch-search-query-string)
(defvar notmuch-search-target-thread)
(defvar notmuch-search-target-line)
;;; Movement ;;; Movement
(defun notmuch-search-scroll-up () (defun notmuch-search-scroll-up ()
@ -404,10 +404,6 @@ new, global search.
Complete list of currently available key bindings: Complete list of currently available key bindings:
\\{notmuch-search-mode-map}" \\{notmuch-search-mode-map}"
(make-local-variable 'notmuch-search-query-string)
(make-local-variable 'notmuch-search-oldest-first)
(make-local-variable 'notmuch-search-target-thread)
(make-local-variable 'notmuch-search-target-line)
(setq notmuch-buffer-refresh-function #'notmuch-search-refresh-view) (setq notmuch-buffer-refresh-function #'notmuch-search-refresh-view)
(setq-local scroll-preserve-screen-position t) (setq-local scroll-preserve-screen-position t)
(add-to-invisibility-spec (cons 'ellipsis t)) (add-to-invisibility-spec (cons 'ellipsis t))