; Fix my last commit

(cherry picked from commit a4587646fabf2b7f0cb19a7e0bee090f9106a73a)

diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 37fcdebbe7b15d0db293ddca7ff55480095dbb08..9b8699f694907897770f8c42fcb023bf46c13b97 100644 (file)
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -102,7 +102,7 @@ See `erc-encoding-coding-alist'."
 
 (defun erc-set-write-file-functions (new-val)
   (declare (obsolete nil "28.1"))
-  (setq-local 'write-file-functions new-val))
+  (setq-local write-file-functions new-val))
 
 (defvar erc-emacs-build-time
   (if (or (stringp emacs-build-time) (not emacs-build-time))

diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index d541dc085c680c67f7dcfb0988ce9053dc0a938d..e1ea9141f0d0a4bab64745df6fca9132e81724ce 100644 (file)
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -370,7 +370,7 @@ See documentation of `walk-windows' for useful values."
 This hook is run during minibuffer setup if `iswitchb' is active.
 For instance:
 \(add-hook \\='iswitchb-minibuffer-setup-hook
-          \\='\(lambda () (setq-local \\='max-mini-window-height 3)))
+          \\='\(lambda () (setq-local max-mini-window-height 3)))
 will constrain the minibuffer to a maximum height of 3 lines when
 iswitchb is running."
   :type 'hook)
@@ -1262,7 +1262,7 @@ Modified from `icomplete-completions'."
   "Set up minibuffer for `iswitchb-buffer'.
 Copied from `icomplete-minibuffer-setup-hook'."
   (when (iswitchb-entryfn-p)
-    (setq-local 'iswitchb-use-mycompletion t)
+    (setq-local iswitchb-use-mycompletion t)
     (add-hook 'pre-command-hook #'iswitchb-pre-command nil t)
     (add-hook 'post-command-hook #'iswitchb-post-command nil t)
     (run-hooks 'iswitchb-minibuffer-setup-hook)))

diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el
index e73e9e0c85b8da1976f27a9250d1b8320795b7cc..f065bcaff26b7d077a7abb016effa407b6535440 100644 (file)
--- a/lisp/obsolete/longlines.el
+++ b/lisp/obsolete/longlines.el
@@ -116,14 +116,14 @@ newlines are indicated with a symbol."
       ;; Turn on longlines mode
       (progn
         (use-hard-newlines 1 'never)
-        (setq-local 'require-final-newline nil)
+        (setq-local require-final-newline nil)
         (add-to-list 'buffer-file-format 'longlines)
         (add-hook 'change-major-mode-hook #'longlines-mode-off nil t)
        (add-hook 'before-revert-hook #'longlines-before-revert-hook nil t)
         (make-local-variable 'longlines-auto-wrap)
-        (setq-local 'isearch-search-fun-function #'longlines-search-function)
-        (setq-local 'replace-search-function #'longlines-search-forward)
-        (setq-local 'replace-re-search-function #'longlines-re-search-forward)
+        (setq-local isearch-search-fun-function #'longlines-search-function)
+        (setq-local replace-search-function #'longlines-search-forward)
+        (setq-local replace-re-search-function #'longlines-re-search-forward)
         (add-function :filter-return (local 'filter-buffer-substring-function)
                       #'longlines-encode-string)
         (when longlines-wrap-follows-window-size
@@ -133,7 +133,7 @@ newlines are indicated with a symbol."
                                (window-width)))
                        longlines-wrap-follows-window-size
                      2)))
-            (setq-local 'fill-column (- (window-width) dw)))
+            (setq-local fill-column (- (window-width) dw)))
           (add-hook 'window-configuration-change-hook
                     #'longlines-window-change-function nil t))
         (let ((buffer-undo-list t)

diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index 877a143f6ad5d37e0f35579a6cd91b030d1cee57..258b2b519d91ba98ffb0261681a0491b895fa8dd 100644 (file)
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -169,7 +169,7 @@ See \\[compile]."
     ;; compilation-parse-errors will find referenced files by Tramp.
     (with-current-buffer next-error-last-buffer
       (when (fboundp 'tramp-make-tramp-file-name)
-        (setq-local 'comint-file-name-prefix
+        (setq-local comint-file-name-prefix
                     (funcall
                      #'tramp-make-tramp-file-name
                      nil ;; method.

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index dc3b31c79acfd589c0443c9a1339db7f0b061146..113eed64917f5354db871c883294759513d01a5e 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -6557,7 +6557,7 @@ and \"Whitesmith\"."
     (let ((option (car setting))
           (value (cdr setting)))
       (set (make-local-variable option) value)))
-  (setq-local 'cperl-file-style style))
+  (setq-local cperl-file-style style))
 
 (declare-function Info-find-node "info"
                  (filename nodename &optional no-going-back strict-case

diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 440b52fe1069ac8d8bf89fc78d90ce287577f0ea..7d189d37929fc62cfb50283a8ead9d6cb7fec7b3 100644 (file)
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -1278,7 +1278,7 @@
     (setq erc-server-current-nick "tester")
     (setq-local erc-last-input-time 0)
     (should-not (local-variable-if-set-p 'erc-send-completed-hook))
-    (setq-local 'erc-send-completed-hook nil) ; skip t (globals)
+    (setq-local erc-send-completed-hook nil) ; skip t (globals)
     ;; Just in case erc-ring-mode is already on
     (setq-local erc--input-review-functions erc--input-review-functions)
     (add-hook 'erc--input-review-functions #'erc-add-to-input-ring)