diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-01-31 16:27:26 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-01-31 20:08:25 +0100 |
| commit | a5885d9d633f0a0e2e23d5d9f48d6b70a6301442 (patch) | |
| tree | 122e0bfafdda9e681cf4d8fc963fec7fef5c36f0 /lisp/vc/ediff-init.el | |
| parent | 2c74924b0194e9947ac4432a2be2d3f6194a4477 (diff) | |
| download | emacs-a5885d9d633f0a0e2e23d5d9f48d6b70a6301442.tar.gz emacs-a5885d9d633f0a0e2e23d5d9f48d6b70a6301442.tar.bz2 emacs-a5885d9d633f0a0e2e23d5d9f48d6b70a6301442.zip | |
Prefer defvar-local in vc/*.el
* lisp/vc/ediff-diff.el (ediff-whitespace, ediff-word-1)
(ediff-word-2, ediff-word-3, ediff-word-4):
* lisp/vc/ediff-init.el (ediff-defvar-local):
* lisp/vc/smerge-mode.el (smerge-check-cache):
* lisp/vc/vc-bzr.el (vc-bzr-annotation-table):
* lisp/vc/vc-dispatcher.el (vc-mode-line-hook): Prefer defvar-local.
Diffstat (limited to 'lisp/vc/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 0865ac5ce41..c20d03c83d6 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -80,13 +80,12 @@ that Ediff doesn't know about.") ;; so that `kill-all-local-variables' (called by major-mode setting ;; commands) won't destroy Ediff control variables. ;; -;; Plagiarized from `emerge-defvar-local' for XEmacs. +;; Plagiarized from `emerge-defvar-local'. (defmacro ediff-defvar-local (var value doc) "Defines VAR as a local variable." (declare (indent defun) (doc-string 3)) `(progn - (defvar ,var ,value ,doc) - (make-variable-buffer-local ',var) + (defvar-local ,var ,value ,doc) (put ',var 'permanent-local t))) |