From 81629b2b2ba282136bc5055bbaa0302321306e61 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 4 May 2025 09:47:49 +0300 Subject: [PATCH 1/7] ; * lisp/gnus/mail-source.el (mail-sources): Fix a typo (bug#78235). --- lisp/gnus/mail-source.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index daba2f3fd20..554db48800d 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -201,8 +201,8 @@ Leave mails for this many days" :value 14))))) (string :tag "Program")) (group :inline t (const :format "" - :value :authenticator) - (choice :tag "Authenticator" + :value :authentication) + (choice :tag "Authentication" :value login ,@mail-source-imap-authenticators)) (group :inline t From b172a1478c16067d88b3a79eed857f265cafb1b7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 5 May 2025 14:51:56 +0300 Subject: [PATCH 2/7] ; * doc/lispref/tips.texi (Library Headers): Fix wording (bug#78253). --- doc/lispref/tips.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index f0238276501..3088decc1b2 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1213,10 +1213,10 @@ lines. Here is a table of them: @table @samp @item ;;; Commentary: This begins introductory comments that explain how the library works. -It should come right after the copying permissions, terminated by a -@samp{Change Log}, @samp{History} or @samp{Code} comment line. This -text is used by the Finder package, so it should make sense in that -context. +It should come right after the copying permissions, and is terminated by +one of the comment lines described below: @samp{Change Log}, +@samp{History} or @samp{Code}. This text is used by the Finder package, +so it should make sense in that context. @item ;;; Change Log: This begins an optional log of changes to the file over time. Don't From ed7b55f6bf1b8d0ceb40c9e196d8b31fd6afc21e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 6 May 2025 12:22:45 +0200 Subject: [PATCH 3/7] Adapt Tramp tests * test/lisp/net/tramp-tests.el (tramp-test29-start-file-process) (tramp-test30-make-process): Adapt tests. --- test/lisp/net/tramp-tests.el | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index e22f1afc18b..2c95cf97ff4 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -5401,6 +5401,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (with-timeout (10 (tramp--test-timeout-handler)) (while (< (- (point-max) (point-min)) (length "foo")) (while (accept-process-output proc 0 nil t)))) + ;; Some `cat' implementations do not support the `cat -' + ;; call. We skip then. + (skip-unless + (not + (string-match-p (rx "cat: -: input file is output file\n") + (buffer-string)))) (should (string-match-p "foo" (buffer-string)))) ;; Cleanup. @@ -5595,6 +5601,12 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." (with-timeout (10 (tramp--test-timeout-handler)) (while (< (- (point-max) (point-min)) (length "foo")) (while (accept-process-output proc 0 nil t)))) + ;; Some `cat' implementations do not support the `cat -' + ;; call. We skip then. + (skip-unless + (not + (string-match-p (rx "cat: -: input file is output file\n") + (buffer-string)))) (should (string-match-p "foo" (buffer-string)))) ;; Cleanup. From 0b4eb525b69822c6b503982ef49980c72c8d0232 Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Tue, 6 May 2025 20:57:06 -0700 Subject: [PATCH 4/7] Make treesit--simple-indent-eval more permissive (bug#78065) * lisp/treesit.el (treesit--simple-indent-eval): Allow EXP to be anything, so higher-order indent presets can take anything as an argument: t, nil, symbols, keywords, etc. --- lisp/treesit.el | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index a26625eca57..2b5989fcaee 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1902,14 +1902,12 @@ the function." ;; `functionp'. ((alist-get exp treesit-simple-indent-presets)) ((functionp exp) exp) - ((symbolp exp) - (if (null exp) - exp - ;; Matchers only return lambdas, anchors only return - ;; integer, so we should never see a variable. - (signal 'treesit-indent-error - (list "Couldn't find the preset corresponding to expression" - exp)))) + ;; There are higher-order presets that take arguments, like + ;; (nth-sibling 1 t), so it's possible for exp to be something + ;; other than numbers and functions. Don't signal an error if + ;; exp isn't a function nor a number. In fact, allow exp to be + ;; any symbol or keyword, so users can define higher-order + ;; presets that takes keyword or symbol as arguments. (t exp))) ;; This variable might seem unnecessary: why split From a7dffc2ea38583db39eaec5f21fd0d8fa5571ab4 Mon Sep 17 00:00:00 2001 From: Stephen Gildea Date: Thu, 8 May 2025 14:48:22 -0700 Subject: [PATCH 5/7] Document 'time-stamp-time-zone' in Emacs Manual * doc/emacs/files.texi (Time Stamp Customization): Document time-stamp-time-zone. --- doc/emacs/files.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 517e2a1fdd0..d7a8822771c 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1107,13 +1107,15 @@ End: --> @end example -@vindex time-stamp-format By default the time stamp is formatted according to your locale setting (@pxref{Environment}) and time zone (@pxref{Time of Day,,, elisp, The Emacs Lisp Reference Manual}). +@vindex time-stamp-time-zone +Set @code{time-stamp-time-zone} to override the time zone used. +@vindex time-stamp-format See the built-in documentation for the variable @code{time-stamp-format} -for specifics and other variables that affect the formatting. +for specifics on formatting and other variables that affect it. @node Time Stamps for One File @subsubsection Forcing Time Stamps for One File From 1a2c29b5317357ba451fdd6f308675a1c6cbba2e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 10 May 2025 10:05:51 +0200 Subject: [PATCH 6/7] Improve Tramp's make-process handling for Solaris * lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Disable buffering also for remote Solaris hosts. Reported by Stacey Marshall . --- lisp/net/tramp-sh.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 9d74c2fd088..046eef791ac 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3115,7 +3115,9 @@ will be used." (let ((pid (tramp-send-command-and-read v "echo $$"))) (setq p (tramp-get-connection-process v)) (process-put p 'remote-pid pid)) - (when (memq connection-type '(nil pipe)) + (when + (or (memq connection-type '(nil pipe)) + (tramp-check-remote-uname v tramp-sunos-unames)) ;; Disable carriage return to newline ;; translation. This does not work on ;; macOS, see Bug#50748. @@ -3131,6 +3133,9 @@ will be used." ;; should set a timeout ;; instead. See `tramp-pipe-stty-settings'. ;; (Bug#62093) + ;; On Solaris, the maximum line length + ;; depends also on MAX_CANON (256). So we + ;; disable buffering as well. ;; FIXME: Shall we rather use "stty raw"? (tramp-send-command v (format From 0d493864cee2ea1d7661d51b973db58667b6b65b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 10 May 2025 13:11:22 +0300 Subject: [PATCH 7/7] Fix indentation of XML comments * lisp/nxml/nxml-mode.el (nxml-compute-indent-in-delimited-token): Fix indentation in XML comments with empty lines. Patch by John Ciolfi . (Bug#73206) --- lisp/nxml/nxml-mode.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 7acc19b9058..1d2471cc1fa 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -1522,6 +1522,8 @@ of the line. This expects the xmltok-* variables to be set up as by ((progn (goto-char pos) (forward-line -1) + (while (looking-at "^[[:blank:]]*$") + (forward-line -1)) (<= (point) xmltok-start)) (goto-char (+ xmltok-start (length open-delim))) (when (and (string= open-delim "