From 572170476eca37d1eb03794fba6d79cbdd96a439 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 31 May 2025 11:08:45 +0300 Subject: [PATCH] Revert "; * lisp/subr.el (setq-local): Doc fix (bug#78644)." This reverts commit cb9556d669c037c4e2f1a9c80adacad55948c706. Some of its parts were not supposed to be installed. (cherry picked from commit 1bb88a86cb38d47006b257fa18a150f23345ad56) --- lisp/cus-edit.el | 3 +-- lisp/custom.el | 3 +-- lisp/subr.el | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index a5abe9e2b96..ec894ab8ee5 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -149,8 +149,7 @@ (error nil)) (condition-case nil - (unless (featurep 'cus-start) - (require 'cus-start)) + (require 'cus-start) (error nil)) (put 'custom-define-hook 'custom-type 'hook) diff --git a/lisp/custom.el b/lisp/custom.el index c7a1c354ee3..048e4a55c72 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -702,8 +702,7 @@ The result is that the change is treated as having been made through Custom." (ignore-errors (require 'cus-load)) (ignore-errors - (unless (featurep 'cus-start) - (require 'cus-start))) + (require 'cus-start)) (dolist (load (get symbol 'custom-loads)) (cond ((symbolp load) (ignore-errors (require load))) ;; This is subsumed by the test below, but it's much faster. diff --git a/lisp/subr.el b/lisp/subr.el index 97717eff07b..d6f05ab4d6c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -161,12 +161,11 @@ of previous VARs. `(progn . ,(nreverse exps)))) (defmacro setq-local (&rest pairs) - "Make each VARIABLE local to current buffer and set it to corresponding VALUE. + "Make each VARIABLE buffer-local and assign to it the corresponding VALUE. The arguments are variable/value pairs. For each VARIABLE in a pair, -make VARIABLE buffer-local in the current buffer and assign to it the -corresponding VALUE of the pair. The VARIABLEs are literal symbols -and should not be quoted. +make VARIABLE buffer-local and assign to it the corresponding VALUE +of the pair. The VARIABLEs are literal symbols and should not be quoted. The VALUE of the Nth pair is not computed until after the VARIABLE of the (N-1)th pair is set; thus, each VALUE can use the new VALUEs -- 2.39.5