master 247b88e5c57 1/3: Merge from savannah/emacs-30

[Po Lu]

branch: master
commit 247b88e5c57c1be27c52cd882680b6a6ea892abe
Merge: 745eae00d41 48f4c9cbbc1
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge from savannah/emacs-30
    
    48f4c9cbbc1 ; Reflow "Commentary" in lisp-mnt.el
    22155753a46 ; * lisp/emacs-lisp/comp-run.el (native--compile-async): ...
    235b9e85a67 package-buffer-info: Move 'require' earlier
---
 lisp/emacs-lisp/comp-run.el | 2 +-
 lisp/emacs-lisp/lisp-mnt.el | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/comp-run.el b/lisp/emacs-lisp/comp-run.el
index 17a9ab71f7e..a659d7f68b7 100644
--- a/lisp/emacs-lisp/comp-run.el
+++ b/lisp/emacs-lisp/comp-run.el
@@ -447,7 +447,7 @@ bytecode definition was not changed in the meantime)."
                       (append comp-files-queue `((,file . ,load)))
                       added-something t)
               (display-warning 'native-compiler
-                               (format "No write access for %s skipping."
+                               (format "Cannot write %s; skipping."
                                        out-filename)))))))
     ;; Perhaps nothing passed `native--compile-async-skip-p'?
     (when (and added-something
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 006e0fb4ead..3c7f047d203 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -70,8 +70,8 @@
 ;; ;;  Eric S. Raymond <esr@thyrsus.com>
 ;;
 ;;    * Maintainer line --- should be a single name/address as in the Author
-;; line, or an address only.  If there is no maintainer
-;; line, the person(s) in the Author field are presumed to be it.
+;; line, or an address only.  If there is no maintainer line, the person(s) in
+;; the Author field are presumed to be it.
 ;;    The idea behind these two fields is to be able to write a Lisp function
 ;; that does "send mail to the author" without having to mine the name out by
 ;; hand.  Please be careful about surrounding the network address with <> if