Merge from origin/emacs-30

d3c39fb522 Fix display of keys in 'help-form' buffers (bug#77118)
6509cc20a9 Improve documentation of 'user-emacs-directory'
3f06059730 Update remarks on name prefixes in coding conventions
e966ff9759 ; * doc/emacs/files.texi (Image Mode): Fix a typo (bug#77...
378bea99b1 ; Fix doc strings of a few Dired commands
30fb2ac07a ; * CONTRIBUTE: Clarify single-line commit should end wit...
417d14a95e ; * admin/MAINTAINERS: Complete the handover of VC
bb756b195a ; Fix typo in Tramp

CONTRIBUTE

@@ -241,6 +241,8 @@ formatting them:
   there will be no individual ChangeLog entries beyond the one in the
   summary line.
 
+- If the commit message is a single-line, it should end with a period.
+
 - If the commit has more than one author, the commit message should
   contain separate lines to mention the other authors, like the
   following:

admin/MAINTAINERS

@@ -245,9 +245,6 @@ Sean Whitton
 ==============================================================================
 2. Areas that someone is willing to maintain, although he would not
 necessarily mind if someone else was the official maintainer.
-This list also includes people who are in the process of handing over
-maintainership to someone listed above, but who want to continue to be
-CC'd as though they were still the primary maintainer, in the meantime.
 ==============================================================================
 
 Eli Zaretskii
@@ -342,7 +339,6 @@ Tassilo Horn
 
 Dmitry Gutov
 	lisp/whitespace.el
-	lisp/vc/*
 
 Vibhav Pant
        lisp/net/browse-url.el

doc/emacs/custom.texi

@@ -2965,9 +2965,19 @@ Emacs will set @code{user-emacs-directory} to the directory it decides
 to use.  This directory is subsequently used to look for your other
 user-specific Emacs files, such as @code{custom-file} (@pxref{Saving
 Customizations}), the saved desktop (@pxref{Saving Emacs Sessions}) and
-others.  The @code{--init-directory} command-line option (@pxref{Initial
+others.  It is also used to compute the value of the
-Options}) overrides the value of @code{user-emacs-directory} determined
+@code{native-comp-eln-load-path} (@pxref{Lisp Libraries}), which is
-as side effect of the search for your user init file described above.
+where Emacs looks for natively-compiled Lisp code and where it deposits
+the newly-compiled Lisp code produced by asynchronous compilation of
+packages your init files and the subsequent Emacs session load.  The
+@code{--init-directory} command-line option (@pxref{Initial Options})
+overrides the value of @code{user-emacs-directory} determined as side
+effect of the search for your user init file described above.
+
+Since @code{user-emacs-directory}, once determined by Emacs, is used by
+the rest of the startup code to locate other files and directories, we
+do not recommend changing its value in your init files, as that could
+disrupt or break the correct startup of your Emacs sessions.
 
 Although this is backward-compatible with older Emacs versions, modern
 POSIX platforms prefer putting your initialization files under

doc/emacs/files.texi

@@ -2529,7 +2529,7 @@ select a group of images to copy somewhere else).  The @kbd{m}
 (@code{image-mode-mark-file}) command will mark the current file in
 any Dired buffer(s) that display the current file's directory.  If no
 such buffer is open, the directory is opened in a new buffer.  To
-unmark files, use the @kbd{u} (@code{image-mode-mark-file}) command.
+unmark files, use the @kbd{u} (@code{image-mode-unmark-file}) command.
 Finally, if you just want to copy the current buffers file name to the
 kill ring, you can use the @kbd{w}
 (@code{image-mode-copy-file-name-as-kill}) command.

doc/lispref/tips.texi

@@ -73,18 +73,13 @@ not meant to be used by other packages.
 Occasionally, for a command name intended for users to use, it is more
 convenient if some words come before the package's name prefix.  For
 example, it is our convention to have commands that list objects named
-as @samp{list-@var{something}}, e.g., a package called @samp{frob}
+as @samp{list-@var{something}}, e.g., a package called @samp{frob} could
-could have a command @samp{list-frobs}, when its other global symbols
+have a command @samp{list-frobs}, when its other global symbols begin
-begin with @samp{frob-}.  Also, constructs that define functions,
+with @samp{frob-}.  Also, constructs that define functions, variables,
-variables, etc., work better if they start with @samp{define-}, so put
+etc., may work better if they start with @samp{define-}, so it's okay to
-the name prefix later on in the name.
+put the name prefix later on in the name.  Outside of these
-
+well-established cases, however, err on the side of prepending your name
-This recommendation applies even to names for traditional Lisp
+prefix.
-primitives that are not primitives in Emacs Lisp---such as
-@code{copy-list}.  Believe it or not, there is more than one plausible
-way to define @code{copy-list}.  Play it safe; append your name prefix
-to produce a name like @code{foo-copy-list} or @code{mylib-copy-list}
-instead.
 
 If you write a function that you think ought to be added to Emacs under
 a certain name, such as @code{twiddle-files}, don't call it by that name

lisp/dired-aux.el

@@ -490,9 +490,11 @@ List has a form of (file-name full-file-name (attribute-list))."
 (defun dired-do-chmod (&optional arg)
   "Change the mode of the marked (or next ARG) files.
 Both octal numeric modes like `644' and symbolic modes like `g+w'
-are supported.  Type \\<minibuffer-local-completion-map>\
+are supported.
-\\[next-history-element] to pull the file attributes of the file
+After invoking the command, \
-at point into the minibuffer.
+type \\<minibuffer-local-completion-map>\\[next-history-element] \
+to pull the file attributes
+of the file at point into the minibuffer.
 
 See Info node `(coreutils)File permissions' for more information.
 Alternatively, see the man page for \"chmod(1)\".
@@ -541,9 +543,10 @@ has no effect on MS-Windows."
 ;;;###autoload
 (defun dired-do-chgrp (&optional arg)
   "Change the group of the marked (or next ARG) files.
-Type \\<minibuffer-local-completion-map>\\[next-history-element] \
+After invoking the command, \
-to pull the file attributes of the file at point
+type \\<minibuffer-local-completion-map>\\[next-history-element] \
-into the minibuffer."
+to pull the file attributes
+of the file at point into the minibuffer."
   (interactive "P" dired-mode)
   (if (and (memq system-type '(ms-dos windows-nt))
            (not (file-remote-p default-directory)))
@@ -553,9 +556,10 @@ into the minibuffer."
 ;;;###autoload
 (defun dired-do-chown (&optional arg)
   "Change the owner of the marked (or next ARG) files.
-Type \\<minibuffer-local-completion-map>\\[next-history-element] \
+After invoking the command, \
-to pull the file attributes of the file at point
+type \\<minibuffer-local-completion-map>\\[next-history-element] \
-into the minibuffer."
+to pull the file attributes
+of the file at point into the minibuffer."
   (interactive "P" dired-mode)
   (if (and (memq system-type '(ms-dos windows-nt))
            (not (file-remote-p default-directory)))
@@ -566,9 +570,10 @@ into the minibuffer."
 (defun dired-do-touch (&optional arg)
   "Change the timestamp of the marked (or next ARG) files.
 This calls touch.
-Type Type \\<minibuffer-local-completion-map>\\[next-history-element] \
+After invoking the command, \
-to pull the file attributes of the file at point
+type \\<minibuffer-local-completion-map>\\[next-history-element] \
-into the minibuffer."
+to pull the file attributes
+of the file at point into the minibuffer."
   (interactive "P" dired-mode)
   (dired-do-chxxx "Timestamp" dired-touch-program 'touch arg))
 

lisp/help.el

@@ -2190,8 +2190,13 @@ The `temp-buffer-window-setup-hook' hook is called."
   "Display the output of a non-nil `help-form'."
   (let ((msg (eval help-form t)))
     (if (stringp msg)
-	(with-output-to-temp-buffer " *Char Help*"
+	(let ((bufname " *Char Help*"))
-	  (princ msg)))))
+          (with-output-to-temp-buffer bufname)
+          ;; Use `insert' instead of `princ' so that keys in `help-form'
+          ;; are displayed with `help-key-binding' face (bug#77118).
+          (with-current-buffer bufname
+            (let (buffer-read-only)
+              (insert msg)))))))
 
 (defun help--append-keystrokes-help (str)
   (let* ((keys (this-single-command-keys))