mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
894b0e3a2f ; Adapt comment in tramp.el
cc87717fa0 Add keyword placeholder to tramp.el
7d0d61d854 Rewrite ERT manual introduction
b2f124f2a8 ; cperl-mode.el: Don't misinterpret exec_fcn as keyword exec
59d1aac49d Document return values of the various read-* functions
This commit is contained in:
Sean Whitton 2025-03-12 10:09:09 +08:00
commit 99852fb867
21 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/files-x.el
View file

@ -38,7 +38,9 @@
;;; Commands to add/delete file-local/directory-local variables.
(defun read-file-local-variable (prompt)
"Read file-local variable using PROMPT and completion.
"Read the name of a file-local variable using PROMPT and completion.
Return the symbol of the variable, or nil if the user entered empty or
null name.
Intended to be used in the `interactive' spec of
`add-file-local-variable', `delete-file-local-variable',
`add-dir-local-variable', `delete-dir-local-variable'."
@ -57,7 +59,7 @@ Intended to be used in the `interactive' spec of
(and (stringp variable) (intern variable))))
(defun read-file-local-variable-value (variable)
"Read value of file-local VARIABLE using completion.
"Read and return the value of a file-local VARIABLE using completion.
Intended to be used in the `interactive' spec of
`add-file-local-variable' and `add-dir-local-variable'."
(cond
@ -90,7 +92,9 @@ Intended to be used in the `interactive' spec of
default)))))
(defun read-file-local-variable-mode ()
"Read per-directory file-local variable's mode using completion.
"Read the name of a per-directory file-local variable's mode using completion.
Return the symbol of the variable, or nil if the user entered empty or
null name.
Intended to be used in the `interactive' spec of
`add-dir-local-variable', `delete-dir-local-variable'."
(let* ((default (and (symbolp major-mode) (symbol-name major-mode)))