commit 6eaa1d279bab8b8c8bf0f16096dc22954a16a7fb (HEAD, refs/remotes/origin/master) Author: Sean Whitton Date: Fri Sep 26 17:25:07 2025 +0100 ; * lisp/vc/vc-git.el (vc-git-cherry-pick-comment): Fix logic. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index b97e0888a56..5002c21747f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -2186,12 +2186,12 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (forward-line 1) (setq comment (buffer-substring-no-properties (point) (point-max)))) (if reverse - (format "Summary: %s\n(cherry picked from commit %s)\n" - comment rev) - (format "Summary: Revert \"%s\"\n\nThis reverts commit %s.\n" - (car (split-string comment "\n" t - split-string-default-separators)) - rev)))) + (format "Summary: Revert \"%s\"\n\nThis reverts commit %s.\n" + (car (split-string comment "\n" t + split-string-default-separators)) + rev) + (format "Summary: %s\n(cherry picked from commit %s)\n" + comment rev)))) (defun vc-git--assert-allowed-rewrite (rev) (when (and (not (and vc-allow-rewriting-published-history commit 398b4f96ce4fe8c1a7a2168e89c72fb4416d24b7 Author: Sean Whitton Date: Fri Sep 26 15:10:13 2025 +0100 vc-test--checkin-patch: Use {author} not {user} * test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch): Use Mercurial template '{author}' not '{user}' for compatibility. diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el index 637609d8717..38c659950c2 100644 --- a/test/lisp/vc/vc-tests/vc-tests.el +++ b/test/lisp/vc/vc-tests/vc-tests.el @@ -835,7 +835,7 @@ This checks also `vc-backend' and `vc-responsible-backend'." (with-output-to-string (vc-hg-command standard-output 0 nil "log" "--limit=1" "--template" - "{user}\n{date|rfc822date}\n{desc}"))))) + "{author}\n{date|rfc822date}\n{desc}"))))) (format "%s\n%s\n%s" author date desc))))) ;; (1) Cleanup. (add-hook 'vc-test--cleanup-hook commit d3333cb1b255efc19d862320dbbb8134714eedae Author: Jakub Ječmínek Date: Mon Aug 25 19:41:51 2025 +0200 nnmbox-read-mbox: fix Xref header parsing * lisp/gnus/nnmbox.el (nnmbox-read-mbox): Use the 'mail-fetch-field' function instead of a broken regexp which matched Date-like headers. (Bug#79167) diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el index fb024bf9ef8..f8575445b65 100644 --- a/lisp/gnus/nnmbox.el +++ b/lisp/gnus/nnmbox.el @@ -683,19 +683,24 @@ ;; headers). In this case, there is an Xref line which ;; provides the relevant information to construct the ;; missing header(s). - (save-excursion - (save-restriction - (narrow-to-region start end) - (if (re-search-forward "\nXref: [^ ]+" end-header t) - ;; generate headers from Xref: - (let (alist) - (while (re-search-forward " \\([^:]+\\):\\([0-9]+\\)" end-header t) - (push (cons (match-string 1) - (string-to-number (match-string 2))) alist)) - (nnmbox-insert-newsgroup-line alist)) - ;; this is really a new article - (nnmbox-save-mail - (nnmail-article-group 'nnmbox-active-number)))))) + (save-excursion + (save-restriction + (narrow-to-region start end) + (let ((xref (with-restriction start end-header + (mail-fetch-field "Xref"))) + alist) + (if (null xref) + ;; this is a new article + (nnmbox-save-mail + (nnmail-article-group 'nnmbox-active-number)) + ;; generate headers from Xref + ;; the first element is hostname so we skip it + (dolist (xref-entry (cdr (split-string xref " "))) + (push (cons + (car (setq xref-entry (split-string xref-entry ":"))) + (string-to-number (cadr xref-entry))) + alist)) + (nnmbox-insert-newsgroup-line alist)))))) (goto-char end)) ;; put article lists in order (setq alist nnmbox-group-active-articles) commit bf750adc4e637d871d551bab5b5c6ff9240797ed Author: Eli Zaretskii Date: Fri Sep 26 14:55:34 2025 +0300 Fix bug#79518 with 'windmove-mode' in "C-h m" display * lisp/windmove.el (windmove-mode): Make sure "C-h m" mentions it. diff --git a/lisp/windmove.el b/lisp/windmove.el index ed76c67ac46..b572d5b76be 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -520,8 +520,10 @@ stopped because it wouldn't move into a window marked with (define-minor-mode windmove-mode "Global minor mode for default windmove commands." :keymap windmove-mode-map + :initialize 'custom-initialize-delay :init-value t - :global t) + :global t + :group 'windows) (defun windmove-install-defaults (prefix modifiers alist &optional uninstall) "Install keys as specified by ALIST. commit 0fe5113fa39c5cfda4f0466d84f63054fec4df83 Author: Eli Zaretskii Date: Fri Sep 26 14:24:00 2025 +0300 Fix dunnet when played on terminals which don't support UTF-8 * lisp/play/dunnet.el (dun-rooms, dun-endgame-question, dun-help) (dun-physobj-desc, dun-endgame-questions): Don't use non-ASCII characters. (Bug#79520) diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index ab9cb568c5d..d2c5811366a 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -149,8 +149,8 @@ kept. The exit is to the west." "You are in a computer room. It seems like most of the equipment has been removed. There is a VAX 11/780 in front of you, however, with one of the cabinets wide open. A sign on the front of the machine -says: This VAX is named ‘pokey’. To type on the console, use the -‘type’ command. The exit is to the east." +says: This VAX is named 'pokey'. To type on the console, use the +'type' command. The exit is to the east." "Computer room" ) ( @@ -160,7 +160,7 @@ to the west, and a door leads to the south." ) ( "You are in a round, stone room with a door to the east. There -is a sign on the wall that reads: ‘receiving room’." +is a sign on the wall that reads: 'receiving room'." "Receiving room" ) ( @@ -237,7 +237,7 @@ northeast through the brush you can see the bear hangout." ( "The entrance to a cave is to the south. To the north, a road leads towards a deep lake. On the ground nearby there is a chute, with a sign -that says ‘put treasures here for points’." +that says 'put treasures here for points'." "Cave Entrance" ;28 ) ( @@ -516,13 +516,13 @@ starvation. Doors lead out to the south and east." ) ( "You are in some sort of maintenance room for the museum. There is a -switch on the wall labeled ‘BL’. There are doors to the west and north." +switch on the wall labeled 'BL'. There are doors to the west and north." "Maintenance room" ;87 ) ( "You are in a classroom where school children were taught about natural -history. On the blackboard is written, ‘No children allowed downstairs.’ -There is a door to the east with an ‘exit’ sign on it. There is another +history. On the blackboard is written, 'No children allowed downstairs.' +There is a door to the east with an 'exit' sign on it. There is another door to the west." "Classroom" ;88 ) @@ -556,7 +556,7 @@ a room to the northeast." ( "You are in another computer room. There is a computer in here larger than you have ever seen. It has no manufacturers name on it, but it -does have a sign that says: This machine's name is ‘endgame’. The +does have a sign that says: This machine's name is 'endgame'. The exit is to the southwest. There is no console here on which you could type." "Endgame computer room" ;95 @@ -567,7 +567,7 @@ type." ) ( "You have reached a question room. You must answer a question correctly in -order to get by. Use the ‘answer’ command to answer the question." +order to get by. Use the 'answer' command to answer the question." "Question room 1" ;97 ) ( @@ -598,7 +598,7 @@ a hallway leads to the south." ( "You have reached a dead end. There is a PC on the floor here. Above it is a sign that reads: - Type the ‘reset’ command to type on the PC. + Type the 'reset' command to type on the PC. A hole leads north." "PC area" ;104 ) @@ -1020,8 +1020,8 @@ the inventory.") 2 Megabytes of RAM onboard." "It looks like some kind of meat. Smells pretty bad." nil -"The paper says: Don't forget to type ‘help’ for help. Also, remember -this word: ‘worms’" +"The paper says: Don't forget to type 'help' for help. Also, remember +this word: 'worms'" "The statuette is of the likeness of Richard Stallman, the author of the famous EMACS editor. You notice that he is not wearing any shoes." nil @@ -1064,10 +1064,10 @@ pipes into nowhere. The hole is too small for a person to fit in. The flush handle is so clean that you can see your reflection in it." nil nil "The box has a slit in the top of it, and on it, in sloppy handwriting, is -written: ‘For key upgrade, put key in here.’" +written: 'For key upgrade, put key in here.'" nil -"It says ‘express mail’ on it." -"It is a 35 passenger bus with the company name ‘mobytours’ on it." +"It says 'express mail' on it." +"It is a 35 passenger bus with the company name 'mobytours' on it." "It is a large metal gate that is too big to climb over." "It is a HIGH cliff." "Unfortunately you do not know enough about dinosaurs to tell very much about @@ -1099,11 +1099,11 @@ nil nil nil nil (setq a (+ a 1)))) (defconst dun-endgame-questions - '(("What is your password on the machine called ‘pokey’?" "robert") + '(("What is your password on the machine called 'pokey'?" "robert") ("What password did you use during anonymous ftp to gamma?" "foo") ("Excluding the endgame, how many places are there where you can put treasures for points?" "4" "four") - ("What is your login name on the ‘endgame’ machine?" "toukmond") + ("What is your login name on the 'endgame' machine?" "toukmond") ("What is the nearest whole dollar to the price of the shovel?" "20" "twenty") ("What is the name of the bus company serving the town?" "mobytours") @@ -1945,7 +1945,7 @@ to swim.") (dun-mprincl " endgame points out of a possible 110.") (if (= (dun-endgame-score) 110) (dun-mprincl -"\n\nCongratulations. You have won. The wizard password is ‘moby’")))) +"\n\nCongratulations. You have won. The wizard password is 'moby'")))) (defun dun-help (_args) (dun-mprincl @@ -1953,7 +1953,7 @@ to swim.") Here is some useful information (read carefully because there are one or more clues in here): - If you have a key that can open a door, you do not need to explicitly - open it. You may just use ‘in’ or walk in the direction of the door. + open it. You may just use 'in' or walk in the direction of the door. - If you have a lamp, it is always lit. @@ -1967,8 +1967,8 @@ or more clues in here): If this happens, your score will decrease, and in many cases you can never get credit for it again. -- You can save your game with the ‘save’ command, and restore it - with the ‘restore’ command. +- You can save your game with the 'save' command, and restore it + with the 'restore' command. - There are no limits on lengths of object names. @@ -2102,7 +2102,7 @@ for a moment, then straighten yourself up.\n") (if (null questions) (progn (dun-mprincl "Your question is:") - (dun-mprincl "No more questions, just do ‘answer foo’.") + (dun-mprincl "No more questions, just do 'answer foo'.") (setq dun-correct-answer '("foo"))) (let* ((which (random (length questions))) (question (nth which questions)))