From bb756b195a7bc6b4cf3286d891a38459dac23cde Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 6 Apr 2025 09:11:06 +0200 Subject: [PATCH 1/8] ; Fix typo in Tramp * lisp/net/tramp-cache.el (with-tramp-saved-connection-property): Fix typo. --- lisp/net/tramp-cache.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 71b8cfa67bf..87e7feae188 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -473,10 +473,10 @@ used to cache connection properties of the local machine." (hash (tramp-get-hash-table key)) (cached (and (hash-table-p hash) (gethash ,property hash tramp-cache-undefined)))) - (tramp-message key 7 "Saved %s %s" property cached) + (tramp-message key 7 "Saved %s %s" ,property cached) (unwind-protect (progn ,@body) ;; Reset PROPERTY. Recompute hash, it could have been flushed. - (tramp-message key 7 "Restored %s %s" property cached) + (tramp-message key 7 "Restored %s %s" ,property cached) (setq hash (tramp-get-hash-table key)) (if (not (eq cached tramp-cache-undefined)) (puthash ,property cached hash) From 417d14a95eeb7294528d6c2dbba394c31254ff4a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Apr 2025 19:03:23 +0800 Subject: [PATCH 2/8] ; * admin/MAINTAINERS: Complete the handover of VC Changed agreed with Dmitry Gutov . --- admin/MAINTAINERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index a47af03eeee..c505c4d4cd2 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -241,9 +241,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 @@ -339,7 +336,6 @@ Tassilo Horn Dmitry Gutov lisp/whitespace.el - lisp/vc/* Vibhav Pant lisp/net/browse-url.el From 30fb2ac07a74d88908013ea80c62fe6317b3a590 Mon Sep 17 00:00:00 2001 From: Jeremy Bryant Date: Mon, 7 Apr 2025 21:47:39 +0100 Subject: [PATCH 3/8] ; * CONTRIBUTE: Clarify single-line commit should end with a period. --- CONTRIBUTE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTE b/CONTRIBUTE index aa6a59cd432..06e6fe45c84 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -238,6 +238,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: From 378bea99b1a41a38c3915fa65e9adce4ec177197 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 9 Apr 2025 14:25:29 +0300 Subject: [PATCH 4/8] ; Fix doc strings of a few Dired commands * lisp/dired-aux.el (dired-do-chown, dired-do-touch) (dired-do-chgrp, dired-do-chmod): Doc fix. (Bug#77650) --- lisp/dired-aux.el | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index a6d04647af8..bd3ab188ffa 100644 --- a/lisp/dired-aux.el +++ b/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 \\\ -\\[next-history-element] to pull the file attributes of the file -at point into the minibuffer. +are supported. +After invoking the command, \ +type \\\\[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 \\\\[next-history-element] \ -to pull the file attributes of the file at point -into the minibuffer." +After invoking the command, \ +type \\\\[next-history-element] \ +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 \\\\[next-history-element] \ -to pull the file attributes of the file at point -into the minibuffer." +After invoking the command, \ +type \\\\[next-history-element] \ +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 \\\\[next-history-element] \ -to pull the file attributes of the file at point -into the minibuffer." +After invoking the command, \ +type \\\\[next-history-element] \ +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)) From e966ff9759ae9fe6aa2e12681bc01315dbe83f71 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 11 Apr 2025 11:33:26 +0300 Subject: [PATCH 5/8] ; * doc/emacs/files.texi (Image Mode): Fix a typo (bug#77723). --- doc/emacs/files.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 2a7017779f6..e15ab605db1 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -2489,7 +2489,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. From 3f06059730679ef6267668e9c1d28ba78534bd56 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 12 Apr 2025 11:05:45 +0800 Subject: [PATCH 6/8] Update remarks on name prefixes in coding conventions * doc/lispref/tips.texi (Coding Conventions): Say that it's okay to put the name prefix later for defining constructs, rather than explicitly instructing the reader to do so. Condense the recommendation to err on the side of prepending the name prefix. --- doc/lispref/tips.texi | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 7eba1c8f388..f0238276501 100644 --- a/doc/lispref/tips.texi +++ b/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} -could have a command @samp{list-frobs}, when its other global symbols -begin with @samp{frob-}. Also, constructs that define functions, -variables, etc., work better if they start with @samp{define-}, so put -the name prefix later on in the name. - -This recommendation applies even to names for traditional Lisp -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. +as @samp{list-@var{something}}, e.g., a package called @samp{frob} could +have a command @samp{list-frobs}, when its other global symbols begin +with @samp{frob-}. Also, constructs that define functions, variables, +etc., may work better if they start with @samp{define-}, so it's okay to +put the name prefix later on in the name. Outside of these +well-established cases, however, err on the side of prepending your name +prefix. 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 From 6509cc20a9e000033fe969fb075d6cd37831d1d1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Apr 2025 09:52:04 +0300 Subject: [PATCH 7/8] Improve documentation of 'user-emacs-directory' * doc/emacs/custom.texi (Find Init): Document the effect of 'user-emacs-directory' on native compilation. Advise against changing the value of 'user-emacs-directory' in init files. (Bug#77745) --- doc/emacs/custom.texi | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 4432a0834aa..f69187ff239 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2964,9 +2964,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 -Options}) overrides the value of @code{user-emacs-directory} determined -as side effect of the search for your user init file described above. +others. It is also used to compute the value of the +@code{native-comp-eln-load-path} (@pxref{Lisp Libraries}), which is +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 From d3c39fb522df50e460940bac10ff489564211d0a Mon Sep 17 00:00:00 2001 From: Stephen Berman Date: Sat, 12 Apr 2025 12:01:50 +0200 Subject: [PATCH 8/8] Fix display of keys in 'help-form' buffers (bug#77118) * lisp/help.el (help-form-show): Use 'insert' instead of 'princ' so that keys in 'help-form' are displayed with 'help-key-binding' face. --- lisp/help.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/help.el b/lisp/help.el index 1d87c2209c8..a06679b31f5 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -2262,8 +2262,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*" - (princ msg))))) + (let ((bufname " *Char Help*")) + (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))