master 6d8801ee739 09/10: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 6d8801ee739a3ddb51effa177822ea2e0d7c73fc
Merge: 924f9bd08a6 476933b2356
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    476933b2356 ; * lisp/simple.el (shell-command-to-string): Fix quotation.
    e27ec0e4144 Improve remote-file-name-inhibit-cache :type
---
 lisp/files.el  |  8 ++++----
 lisp/shell.el  | 16 ++++++++--------
 lisp/simple.el |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index b67482a2f74..9d766683d26 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1322,10 +1322,10 @@ consecutive checks.  For example:
   :group 'tramp
   :version "24.1"
   :type '(choice
-         (const   :tag "Do not inhibit file name cache" nil)
-         (const   :tag "Do not use file name cache" t)
-         (integer :tag "Do not use file name cache"
-                  :format "Do not use file name cache older then %v seconds"
+          (const   :tag "Do not cache remote file attributes" t)
+          (const   :tag "Cache remote file attributes" nil)
+          (integer :tag "Cache remote file attributes with expiration"
+                   :format "Cache expiry in seconds: %v"
                   :value 10)))
 
 (defcustom remote-file-name-access-timeout nil
diff --git a/lisp/shell.el b/lisp/shell.el
index 21ffdc63a05..48978fecbdd 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1637,15 +1637,15 @@ Returns t if successful."
   "Whether to inhibit cache for fontifying shell commands in remote buffers.
 When fontification of non-existent commands is enabled in a
 remote shell buffer, use a cache to speed up searching for
-executable files on the remote machine.  This options is used to
-control expiry of this cache.  See `remote-file-name-inhibit-cache'
-for description."
+executable files on the remote machine.  This option controls
+expiry of the cache.  See `remote-file-name-inhibit-cache' for
+a description of the possible options."
   :group 'faces
   :type '(choice
-          (const :tag "Do not inhibit file name cache" nil)
-          (const :tag "Do not use file name cache" t)
-          (integer :tag "Do not use file name cache"
-                   :format "Do not use file name cache older than %v seconds"
+          (const :tag "Do not cache remote executables" t)
+          (const :tag "Cache remote executables" nil)
+          (integer :tag "Cache remote executables with expiration"
+                   :format "Cache expiry in seconds: %v"
                    :value 10))
   :version "29.1")
 
@@ -1658,7 +1658,7 @@ EXECUTABLES is a hash table with keys being the 
base-names of
 executable files.
 
 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)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 8076a57cb2f..2cb3f45866c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5103,7 +5103,7 @@ other cases, consider alternatives such as `call-process' 
or
 `process-lines', which do not invoke the shell.  Consider using
 built-in functions like `rename-file' instead of the external
 command \"mv\".  For more information, see Info node
-‘(elisp)Security Considerations’."
+`(elisp)Security Considerations'."
   (with-output-to-string
     (with-current-buffer standard-output
       (shell-command command t))))