master c79a4c49ca0 03/10: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit c79a4c49ca0cf0cfe90d8e56cb24ad75f327348a
Merge: d56464b9d13 71a1f0fdc9e
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    71a1f0fdc9e Add more missing builtin package declarations
    94705f83005 ; Fix last change in shell-command-to-string
---
 lisp/emacs-lisp/shorthands.el | 1 +
 lisp/epa-ks.el                | 1 +
 lisp/simple.el                | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/shorthands.el b/lisp/emacs-lisp/shorthands.el
index bb18ac33497..82200ab88e9 100644
--- a/lisp/emacs-lisp/shorthands.el
+++ b/lisp/emacs-lisp/shorthands.el
@@ -4,6 +4,7 @@
 
 ;; Author: João Távora <joaotavora@gmail.com>
 ;; Keywords: lisp
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/epa-ks.el b/lisp/epa-ks.el
index 015bf910ac6..3dbce0259b3 100644
--- a/lisp/epa-ks.el
+++ b/lisp/epa-ks.el
@@ -4,6 +4,7 @@
 
 ;; Author: Philip K. <philipk@posteo.net>
 ;; Keywords: PGP, GnuPG
+;; Package: epa
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 7a05584fc4b..8076a57cb2f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5100,9 +5100,10 @@ COMMAND before passing it as an argument to this 
function.
 
 Use this function only when a shell interpreter is needed.  In
 other cases, consider alternatives such as `call-process' or
-`process-lines', which do not invoke the shell.  Prefer built-in
-functions like `mv' to the external command \"mv\".  For more
-information, see Info node ‘(elisp)Security Considerations’."
+`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’."
   (with-output-to-string
     (with-current-buffer standard-output
       (shell-command command t))))