mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-29

Browse source 
476933b235 ; * lisp/simple.el (shell-command-to-string): Fix quotation.
e27ec0e414 Improve remote-file-name-inhibit-cache :type
This commit is contained in:
Eli Zaretskii 2023-09-23 09:41:11 -04:00
commit 6d8801ee73
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/files.el
View file

@ -1322,10 +1322,10 @@ consecutive checks. For example:
:group 'tramp :group 'tramp
:version "24.1" :version "24.1"
:type '(choice :type '(choice
(const :tag "Do not inhibit file name cache" nil) (const :tag "Do not cache remote file attributes" t)
(const :tag "Do not use file name cache" t) (const :tag "Cache remote file attributes" nil)
(integer :tag "Do not use file name cache" (integer :tag "Cache remote file attributes with expiration"
:format "Do not use file name cache older then %v seconds" :format "Cache expiry in seconds: %v"
:value 10))) :value 10)))
(defcustom remote-file-name-access-timeout nil (defcustom remote-file-name-access-timeout nil

16
lisp/shell.el
View file

@ -1637,15 +1637,15 @@ Returns t if successful."
"Whether to inhibit cache for fontifying shell commands in remote buffers. "Whether to inhibit cache for fontifying shell commands in remote buffers.
When fontification of non-existent commands is enabled in a When fontification of non-existent commands is enabled in a
remote shell buffer, use a cache to speed up searching for remote shell buffer, use a cache to speed up searching for
executable files on the remote machine. This options is used to executable files on the remote machine. This option controls
control expiry of this cache. See `remote-file-name-inhibit-cache' expiry of the cache. See `remote-file-name-inhibit-cache' for
for description." a description of the possible options."
:group 'faces :group 'faces
:type '(choice :type '(choice
(const :tag "Do not inhibit file name cache" nil) (const :tag "Do not cache remote executables" t)
(const :tag "Do not use file name cache" t) (const :tag "Cache remote executables" nil)
(integer :tag "Do not use file name cache" (integer :tag "Cache remote executables with expiration"
:format "Do not use file name cache older than %v seconds" :format "Cache expiry in seconds: %v"
:value 10)) :value 10))
:version "29.1") :version "29.1")
@ -1658,7 +1658,7 @@ EXECUTABLES is a hash table with keys being the base-names of
executable files. executable files.
Cache expiry is controlled by the user option Cache expiry is controlled by the user option
`remote-file-name-inhibit-cache'.") `shell-highlight-undef-remote-file-name-inhibit-cache'.")
(defvar shell--highlight-undef-face 'shell-highlight-undef-defined-face) (defvar shell--highlight-undef-face 'shell-highlight-undef-defined-face)

2
lisp/simple.el
View file

@ -5103,7 +5103,7 @@ other cases, consider alternatives such as `call-process' or
`process-lines', which do not invoke the shell. Consider using `process-lines', which do not invoke the shell. Consider using
built-in functions like `rename-file' instead of the external built-in functions like `rename-file' instead of the external
command \"mv\". For more information, see Info node command \"mv\". For more information, see Info node
‘(elisp)Security Considerations’." `(elisp)Security Considerations'."
(with-output-to-string (with-output-to-string
(with-current-buffer standard-output (with-current-buffer standard-output
(shell-command command t)))) (shell-command command t))))