masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 19:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "; * lisp/subr.el (setq-local): Doc fix (bug#78644)."

Browse source 
This reverts commit cb9556d669.
Some of its parts were not supposed to be installed.
This commit is contained in:
Eli Zaretskii 2025-05-31 11:08:45 +03:00
parent cb9556d669
commit 1bb88a86cb
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/cus-edit.el
View file

@ -149,8 +149,7 @@
(error nil)) (error nil))
(condition-case nil (condition-case nil
(unless (featurep 'cus-start) (require 'cus-start)
(require 'cus-start))
(error nil)) (error nil))
(put 'custom-define-hook 'custom-type 'hook) (put 'custom-define-hook 'custom-type 'hook)

3
lisp/custom.el
View file

@ -699,8 +699,7 @@ The result is that the change is treated as having been made through Custom."
(ignore-errors (ignore-errors
(require 'cus-load)) (require 'cus-load))
(ignore-errors (ignore-errors
(unless (featurep 'cus-start) (require 'cus-start))
(require 'cus-start)))
(dolist (load (get symbol 'custom-loads)) (dolist (load (get symbol 'custom-loads))
(cond ((symbolp load) (ignore-errors (require load))) (cond ((symbolp load) (ignore-errors (require load)))
;; This is subsumed by the test below, but it's much faster. ;; This is subsumed by the test below, but it's much faster.

7
lisp/subr.el
View file

@ -161,12 +161,11 @@ of previous VARs.
`(progn . ,(nreverse exps)))) `(progn . ,(nreverse exps))))
(defmacro setq-local (&rest pairs) (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, 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 make VARIABLE buffer-local and assign to it the corresponding VALUE
corresponding VALUE of the pair. The VARIABLEs are literal symbols of the pair. The VARIABLEs are literal symbols and should not be quoted.
and should not be quoted.
The VALUE of the Nth pair is not computed until after the VARIABLE 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 of the (N-1)th pair is set; thus, each VALUE can use the new VALUEs