Prefer setq-local in emacs-lisp/*.el

* lisp/emacs-lisp/chart.el (chart-mode):
* lisp/emacs-lisp/copyright.el (copyright-update):
* lisp/emacs-lisp/eieio-custom.el (eieio-customize-object):
* lisp/emacs-lisp/elint.el (elint-update-env, elint-init-form):
* lisp/emacs-lisp/ert.el (ert--results-update-ewoc-hf):
(ert--setup-results-buffer):
* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables):
* lisp/emacs-lisp/pp.el (pp-display-expression):
* lisp/emacs-lisp/re-builder.el (reb-mode, reb-restart-font-lock):
* lisp/emacs-lisp/shadow.el (load-path-shadows-mode):
* lisp/emacs-lisp/smie.el (smie-setup):
* lisp/emacs-lisp/syntax.el (syntax-propertize):
* lisp/emacs-lisp/trace.el (trace-make-advice): Prefer setq-local.

diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 177710038a0daa015df9524cb31ce356697a4f5f..c1c6e3bf0fdeff4f70689efd4857766ee6bec2bc 100644 (file)
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -120,7 +120,7 @@ too much in text characters anyways.")
 (define-derived-mode chart-mode special-mode "Chart"
   "Define a mode in Emacs for displaying a chart."
   (buffer-disable-undo)
-  (set (make-local-variable 'font-lock-global-modes) nil)
+  (setq-local font-lock-global-modes nil)
   (font-lock-mode -1)                   ;Isn't it off already?  --Stef
   )
 

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 9828ca63ebc6d08ed99b1c7c5617546c6284d29a..edeeb03c32a37f0f80f06fcee2c96eb703c9e990 100644 (file)
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -256,7 +256,7 @@ interactively."
                                  (match-string-no-properties 1)
                                  copyright-current-gpl-version)))))
                 (replace-match copyright-current-gpl-version t t nil 1))))
-       (set (make-local-variable 'copyright-update) nil)))
+        (setq-local copyright-update nil)))
     ;; If a write-file-hook returns non-nil, the file is presumed to be written.
     nil))
 

diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 3a9d8672e46f8c82a8354ce6a5d63ac7717bd97f..c1378cbeb79dbe94cf00f922f47eb5ec3bf527a0 100644 (file)
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -365,8 +365,7 @@ These groups are specified with the `:group' slot flag."
     (widget-insert "\n\n")
     (widget-insert "Edit object " (eieio-object-name obj) "\n\n")
     ;; Create the widget editing the object.
-    (make-local-variable 'eieio-wo)
-    (setq eieio-wo (eieio-custom-widget-insert obj :eieio-group g))
+    (setq-local eieio-wo (eieio-custom-widget-insert obj :eieio-group g))
     ;;Now generate the apply buttons
     (widget-insert "\n")
     (eieio-custom-object-apply-reset obj)
@@ -375,10 +374,8 @@ These groups are specified with the `:group' slot flag."
     ;;(widget-minor-mode)
     (goto-char (point-min))
     (widget-forward 3)
-    (make-local-variable 'eieio-co)
-    (setq eieio-co obj)
-    (make-local-variable 'eieio-cog)
-    (setq eieio-cog g)))
+    (setq-local eieio-co obj)
+    (setq-local eieio-cog g)))
 
 (cl-defmethod eieio-custom-object-apply-reset ((_obj eieio-default-superclass))
   "Insert an Apply and Reset button into the object editor.

diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index e2cffedd45f34ea41f58ea7d2b3a8cb79f375e9e..ef97c8279d7149e1f68f9a85348681b723c96352 100644 (file)
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -355,15 +355,14 @@ Returns the forms."
       ;; Env is up to date
       elint-buffer-forms
     ;; Remake env
-    (set (make-local-variable 'elint-buffer-forms) (elint-get-top-forms))
-    (set (make-local-variable 'elint-features) nil)
-    (set (make-local-variable 'elint-buffer-env)
-        (elint-init-env elint-buffer-forms))
+    (setq-local elint-buffer-forms (elint-get-top-forms))
+    (setq-local elint-features nil)
+    (setq-local elint-buffer-env (elint-init-env elint-buffer-forms))
     (if elint-preloaded-env
         ;; FIXME: This doesn't do anything!  Should we setq the result to
         ;; elint-buffer-env?
        (elint-env-add-env elint-preloaded-env elint-buffer-env))
-    (set (make-local-variable 'elint-last-env-time) (buffer-modified-tick))
+    (setq-local elint-last-env-time (buffer-modified-tick))
     elint-buffer-forms))
 
 (defun elint-get-top-forms ()
@@ -456,8 +455,8 @@ Return nil if there are no more forms, t otherwise."
         (= 4 (length form))
         (eq (car-safe (cadr form)) 'quote)
         (equal (nth 2 form) '(quote error-conditions)))
-    (set (make-local-variable 'elint-extra-errors)
-        (cons (cadr (cadr form)) elint-extra-errors)))
+    (setq-local elint-extra-errors
+                (cons (cadr (cadr form)) elint-extra-errors)))
    ((eq (car form) 'provide)
     (add-to-list 'elint-features (eval (cadr form))))
    ;; Import variable definitions

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index e5ac1d1f1cb11d8ddff4c58e69c5faf3ec78a92b..5f29c2665a3923394e851c965af067915e8421f8 100644 (file)
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1802,8 +1802,8 @@ Also sets `ert--results-progress-bar-button-begin'."
            ;; `progress-bar-button-begin' will be the right position
            ;; even in the results buffer.
            (with-current-buffer results-buffer
-             (set (make-local-variable 'ert--results-progress-bar-button-begin)
-                  progress-bar-button-begin))))
+             (setq-local ert--results-progress-bar-button-begin
+                         progress-bar-button-begin))))
        (insert "\n\n")
        (buffer-string))
      ;; footer
@@ -1979,15 +1979,15 @@ BUFFER-NAME, if non-nil, is the buffer name to use."
         ;; from ert-results-mode to ert-results-mode when
         ;; font-lock-mode turns itself off in change-major-mode-hook.)
         (erase-buffer)
-        (set (make-local-variable 'font-lock-function)
-             'ert--results-font-lock-function)
+        (setq-local font-lock-function
+                    'ert--results-font-lock-function)
         (let ((ewoc (ewoc-create 'ert--print-test-for-ewoc nil nil t)))
-          (set (make-local-variable 'ert--results-ewoc) ewoc)
-          (set (make-local-variable 'ert--results-stats) stats)
-          (set (make-local-variable 'ert--results-progress-bar-string)
-               (make-string (ert-stats-total stats)
-                            (ert-char-for-test-result nil t)))
-          (set (make-local-variable 'ert--results-listener) listener)
+          (setq-local ert--results-ewoc ewoc)
+          (setq-local ert--results-stats stats)
+          (setq-local ert--results-progress-bar-string
+                      (make-string (ert-stats-total stats)
+                                   (ert-char-for-test-result nil t)))
+          (setq-local ert--results-listener listener)
           (cl-loop for test across (ert--stats-tests stats) do
                    (ewoc-enter-last ewoc
                                     (make-ert--ewoc-entry :test test

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index cc40af7a41c08d93f7c9044411634a928e76f04c..081ef8d441a1c7eaa904b521a9f8a6158b7c9f97 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -634,7 +634,7 @@ font-lock keywords will not be case sensitive."
   ;; and should make no difference for explicit fill
   ;; because lisp-fill-paragraph should do the job.
   ;;  I believe that newcomment's auto-fill code properly deals with it  -stef
-  ;;(set (make-local-variable 'adaptive-fill-mode) nil)
+  ;;(setq-local adaptive-fill-mode nil)
   (setq-local indent-line-function 'lisp-indent-line)
   (setq-local indent-region-function 'lisp-indent-region)
   (setq-local comment-indent-function #'lisp-comment-indent)

diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 458f803ffe3324f57b09f4c0ee0ac0eb0aad1c75..de7d2020ea8f49b6c5fabf42dbe9e694c732065a 100644 (file)
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -118,7 +118,7 @@ after OUT-BUFFER-NAME."
       (with-current-buffer standard-output
        (emacs-lisp-mode)
        (setq buffer-read-only nil)
-       (set (make-local-variable 'font-lock-verbose) nil)))))
+        (setq-local font-lock-verbose nil)))))
 
 ;;;###autoload
 (defun pp-eval-expression (expression)

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 78ae3a8c1e5839c6d4fa06109466742a2ab756ff..ffbf3b4b4dd4f92817061fe2b6f94c2bc96a6cfa 100644 (file)
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -271,7 +271,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
 
 (define-derived-mode reb-mode nil "RE Builder"
   "Major mode for interactively building Regular Expressions."
-  (set (make-local-variable 'blink-matching-paren) nil)
+  (setq-local blink-matching-paren nil)
   (reb-mode-common))
 
 (defvar reb-lisp-mode-map
@@ -832,8 +832,8 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
     (let ((font-lock-is-on font-lock-mode))
       (font-lock-mode -1)
       (kill-local-variable 'font-lock-set-defaults)
-      ;;(set (make-local-variable 'reb-re-syntax) 'string)
-      ;;(set (make-local-variable 'reb-re-syntax) 'rx)
+      ;;(setq-local reb-re-syntax 'string)
+      ;;(setq-local reb-re-syntax 'rx)
       (setq font-lock-defaults
             (cond
              ((memq reb-re-syntax '(read string))

diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index f1863869dd3f3463559adbfbfae95bf4b89fb4aa..68f58f69f7bc0fdf5a330818dee38f846d59ff24 100644 (file)
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -177,8 +177,8 @@ See the documentation for `list-load-path-shadows' for further information."
 
 (define-derived-mode load-path-shadows-mode fundamental-mode "LP-Shadows"
   "Major mode for load-path shadows buffer."
-  (set (make-local-variable 'font-lock-defaults)
-       '((load-path-shadows-font-lock-keywords)))
+  (setq-local font-lock-defaults
+              '((load-path-shadows-font-lock-keywords)))
   (setq buffer-undo-list t
        buffer-read-only t))
 

diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 1b700afd12d2746e48786b60975fda1342864c5b..355dd0f49e8cf9669690f344eb102d2bf277e158 100644 (file)
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -1891,9 +1891,9 @@ KEYWORDS are additional arguments, which can use the following keywords:
           (v (pop keywords)))
       (pcase k
         (:forward-token
-         (set (make-local-variable 'smie-forward-token-function) v))
+         (setq-local smie-forward-token-function v))
         (:backward-token
-         (set (make-local-variable 'smie-backward-token-function) v))
+         (setq-local smie-backward-token-function v))
         (_ (message "smie-setup: ignoring unknown keyword %s" k)))))
   (let ((ca (cdr (assq :smie-closer-alist grammar))))
     (when ca

diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 62f1b16d75cd5a5fd19db46c813ce977931a51aa..e35f9d89ded4221e8792ad9073fa5aa1e77f7837 100644 (file)
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -353,7 +353,7 @@ set by `syntax-propertize'")
         (setq syntax-propertize--done (max (point-max) pos))
       ;; (message "Needs to syntax-propertize from %s to %s"
       ;;          syntax-propertize--done pos)
-      (set (make-local-variable 'parse-sexp-lookup-properties) t)
+      (setq-local parse-sexp-lookup-properties t)
       (when (< syntax-propertize--done (point-min))
         ;; *Usually* syntax-propertize is called via syntax-ppss which
         ;; takes care of adding syntax-ppss-flush-cache to b-c-f, but this

diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 627305689c7bb61fa28bf016aeaff5ac48e9c8c8..28e964ec4c218287e64e55379ee7b551ccf79261 100644 (file)
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -225,7 +225,7 @@ be printed along with the arguments in the trace."
           (ctx (funcall context)))
       (unless inhibit-trace
         (with-current-buffer trace-buffer
-          (set (make-local-variable 'window-point-insertion-type) t)
+          (setq-local window-point-insertion-type t)
           (unless background (trace--display-buffer trace-buffer))
           (goto-char (point-max))
           ;; Insert a separator from previous trace output: