summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-01-31 19:28:22 +0100
committerStefan Kangas <stefan@marxist.se>2021-01-31 20:08:25 +0100
commit2c754cf449e97203187556390d2c219a50f7c950 (patch)
tree0b457d5ccfcd3be37128f968c51570d70daf0c50
parent59e8c37d61d313335408f8f23e3025b499200266 (diff)
downloademacs-2c754cf449e97203187556390d2c219a50f7c950.tar.gz
Prefer defvar-local in mail/*.el
* lisp/mail/emacsbug.el (report-emacs-bug-send-command) (report-emacs-bug-send-hook): * lisp/mail/reporter.el (reporter-initial-text): * lisp/mail/supercite.el (sc-mail-info, sc-attributions): * lisp/mail/rmail.el (rmail-buffer-swapped, rmail-view-buffer): Prefer defvar-local.
-rw-r--r--lisp/mail/emacsbug.el6
-rw-r--r--lisp/mail/reporter.el3
-rw-r--r--lisp/mail/rmail.el6
-rw-r--r--lisp/mail/supercite.el7
4 files changed, 7 insertions, 15 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 4e8009db864..815ff4339eb 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -58,13 +58,11 @@
(defvar report-emacs-bug-orig-text nil
"The automatically-created initial text of the bug report.")
-(defvar report-emacs-bug-send-command nil
+(defvar-local report-emacs-bug-send-command nil
"Name of the command to send the bug report, as a string.")
-(make-variable-buffer-local 'report-emacs-bug-send-command)
-(defvar report-emacs-bug-send-hook nil
+(defvar-local report-emacs-bug-send-hook nil
"Hook run before sending the bug report.")
-(make-variable-buffer-local 'report-emacs-bug-send-hook)
(declare-function x-server-vendor "xfns.c" (&optional terminal))
(declare-function x-server-version "xfns.c" (&optional terminal))
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 2e583a470d6..4b70582a261 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -100,9 +100,8 @@ This is necessary to properly support the printing of buffer-local
variables. Current buffer will always be the mail buffer being
composed.")
-(defvar reporter-initial-text nil
+(defvar-local reporter-initial-text nil
"The automatically created initial text of a bug report.")
-(make-variable-buffer-local 'reporter-initial-text)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9f95b62d870..8ccf1bffdd6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -620,14 +620,12 @@ Element N specifies the summary line for message N+1.")
;; Rmail buffer swapping variables.
-(defvar rmail-buffer-swapped nil
+(defvar-local rmail-buffer-swapped nil
"If non-nil, `rmail-buffer' is swapped with `rmail-view-buffer'.")
-(make-variable-buffer-local 'rmail-buffer-swapped)
(put 'rmail-buffer-swapped 'permanent-local t)
-(defvar rmail-view-buffer nil
+(defvar-local rmail-view-buffer nil
"Buffer which holds RMAIL message for MIME displaying.")
-(make-variable-buffer-local 'rmail-view-buffer)
(put 'rmail-view-buffer 'permanent-local t)
;; `Sticky' default variables.
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 5766c791878..99ac41dd9ba 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -509,9 +509,9 @@ string."
;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
;; end user configuration variables
-(defvar sc-mail-info nil
+(defvar-local sc-mail-info nil
"Alist of mail header information gleaned from reply buffer.")
-(defvar sc-attributions nil
+(defvar-local sc-attributions nil
"Alist of attributions for use when citing.")
(defvar sc-tmp-nested-regexp nil
@@ -521,9 +521,6 @@ string."
(defvar sc-tmp-dumb-regexp nil
"Temp regexp describing non-nested citation cited with a nesting citer.")
-(make-variable-buffer-local 'sc-mail-info)
-(make-variable-buffer-local 'sc-attributions)
-
;; ======================================================================
;; supercite keymaps