From 42d32713be9a23346de09b84983e1dd3b44b3400 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 10 Jan 2021 15:01:03 +0100 Subject: [PATCH] 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. --- emacs/notmuch-lib.el | 1 + emacs/notmuch.el | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 72549a98..2fd9a27d 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -101,6 +101,7 @@ search results. Note that any filtered searches created by search." :type 'boolean :group 'notmuch-search) +(make-variable-buffer-local 'notmuch-search-oldest-first) (defcustom notmuch-poll-script nil "[Deprecated] Command to run to incorporate new mail into the notmuch database. diff --git a/emacs/notmuch.el b/emacs/notmuch.el index ccece811..027c5cfa 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -205,6 +205,12 @@ there will be called at other points of notmuch execution." map) "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 (defvar notmuch-search-stash-map @@ -226,12 +232,6 @@ there will be called at other points of notmuch execution." (interactive) (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 (defun notmuch-search-scroll-up () @@ -404,10 +404,6 @@ new, global search. Complete list of currently available key bindings: \\{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-local scroll-preserve-screen-position t) (add-to-invisibility-spec (cons 'ellipsis t))