commit 8bea0aae3bb59bd0452c61f856d74650838f6a45 (HEAD, refs/remotes/origin/master)
Author: Mauro Aranda <maurooaranda@gmail.com>
Date:   Sat Feb 15 09:43:58 2025 -0300

    Action button when point is just after it
    
    * lisp/cus-edit.el (Custom-newline): If no button at point,
    check for a button before point.  (Bug#72341)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index e0e39b72c76..5cfd2b774b7 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -5351,10 +5351,13 @@ The format is suitable for use with `easy-menu-define'."
 To see what function the widget will call, use the
 `widget-describe' command."
   (interactive "@d")
-  (let ((button (get-char-property pos 'button)))
-    ;; If there is no button at point, then use the one at the start
-    ;; of the line, if it is a custom-group-link (bug#2298).
+  (let ((button (or (get-char-property pos 'button)
+                    ;; Maybe we are just past a button, and it's quite handy
+                    ;; to action it as well.  (Bug#72341)
+                    (get-char-property (1- pos) 'button))))
     (or button
+        ;; If there is no button at point, then use the one at the start
+        ;; of the line, if it is a custom-group-link (bug#2298).
 	(if (setq button (get-char-property (line-beginning-position) 'button))
 	    (or (eq (widget-type button) 'custom-group-link)
 		(setq button nil))))

commit 00e284fc52b44fc3cb435a5d17ce58af1b753a34
Author: Christoph Badura <bad@bsd.de>
Date:   Sun Jan 26 22:48:11 2025 +0100

    VC: New hook to strip CVS template lines when committing
    
    Add a hook function to strip all lines beginning with "CVS:" from the
    commit message as CVS does.  Do this only if 'log-edit-vc-backend' is
    'CVS'.  (Bug#72341)
    
    * lisp/vc/log-edit.el
    (log-edit-done-strip-cvs-lines): New command.
    (log-edit-done-hook): Add it as an option.
    
    * test/lisp/vc/log-edit-tests.el
    (log-edit-done-strip-cvs-lines-helper): New function.
    (log-edit-done-strip-cvs-lines-cvs)
    (log-edit-done-strip-cvs-lines-non-cvs)
    (log-edit-done-strip-cvs-lines-only-cvs-colon-blank)
    (log-edit-done-strip-cvs-lines-only-cvs-colon): New test cases.
    
    * etc/NEWS: Mention log-edit-done-strip-cvs-lines.

diff --git a/etc/NEWS b/etc/NEWS
index db49c4cde67..6cfed2932d4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1335,6 +1335,12 @@ the directory into which the repository was cloned.
 *** 'C-x v u' ('vc-revert') now works on directories listed in VC Directory.
 Reverting a directory means reverting changes to all files inside it.
 
+*** New function 'log-edit-done-strip-cvs-lines'.
+This function strips all lines beginning with "CVS:" from the buffer.
+It is intended to be added to the 'log-edit-done-hook' so that
+'vc-cvs-checkin' behaves like invoking "cvs commit [files...]" from the
+command line.
+
 ** Package
 
 +++
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index bb85de8bd10..3eb614f6030 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -210,7 +210,8 @@ such as a bug-tracking system.  The list of files about to be committed
 can be obtained from `log-edit-files'."
   :group 'log-edit
   :type '(hook :options (log-edit-set-common-indentation
-			 log-edit-add-to-changelog)))
+                         log-edit-add-to-changelog
+                         log-edit-done-strip-cvs-lines)))
 
 (defcustom log-edit-strip-single-file-name nil
   "If non-nil, remove file name from single-file log entries."
@@ -927,6 +928,20 @@ This simply uses the local CVS/Template file."
       (goto-char (point-max))
       (insert-file-contents "CVS/Template"))))
 
+(defun log-edit-done-strip-cvs-lines (&optional interactive)
+  "Strip lines starting with \"CVS:\" from commit log message.
+When not called interactively do this only when the VC backend is CVS.
+This mimicks what CVS does when invoked as \\='cvs commit [files...]'."
+  (interactive "p")
+  (when (or interactive (eq log-edit-vc-backend 'CVS))
+    (let ((case-fold-search nil))
+      (goto-char (point-min))
+      ;; NB: While CVS defines CVSEDITPREFIX as "CVS: " it actually
+      ;; checks only the first four characters of af a line, i.e. "CVS:"
+      ;; to deal with editors that strip trailing whitespace.
+      ;; c.f. src/cvs.h and src/logmsg.c:do_editor()
+      (flush-lines "^CVS:"))))
+
 (defun log-edit-insert-cvs-rcstemplate ()
   "Insert the RCS commit log template from the CVS repository.
 This contacts the repository to get the rcstemplate file and
diff --git a/test/lisp/vc/log-edit-tests.el b/test/lisp/vc/log-edit-tests.el
index 005c336a3b6..6a312c6dac7 100644
--- a/test/lisp/vc/log-edit-tests.el
+++ b/test/lisp/vc/log-edit-tests.el
@@ -360,4 +360,57 @@ Report color and/or grayscale properly.
       (let ((fill-column 64)) (log-edit-fill-entry))
       (should (equal (buffer-string) wanted)))))
 
+(defun log-edit-done-strip-cvs-lines-helper (initial-text wanted vc-backend)
+  "Helper function for the log-edit-done-strip-cvs-lines tests.
+Tests that running log-edit-done-strip-cvs-lines as a log-edit-done-hook
+produces the WANTED string when run on INITIAL-TEXT with
+'log-edit-vc-backend' set to VC-BACKEND.\""
+  (with-temp-buffer
+      (let ((log-edit-done-hook 'log-edit-done-strip-cvs-lines)
+            (log-edit-vc-backend vc-backend))
+        (setq-local log-edit-callback #'(lambda () (interactive) nil))
+        (insert initial-text)
+        (log-edit-done)
+        (should (equal (buffer-string) wanted)))))
+
+(ert-deftest log-edit-done-strip-cvs-lines-cvs ()
+  "Strip lines beginning with \"CVS:\" when using CVS as VC backend."
+  (let (string wanted)
+    (setq string "summary line
+first line
+CVS: Please evaluate your changes and consider the following.
+CVS: Abort checkin if you answer no.
+"
+          wanted "summary line
+first line
+")
+    (log-edit-done-strip-cvs-lines-helper string wanted 'CVS)))
+
+(ert-deftest log-edit-done-strip-cvs-lines-non-cvs ()
+  "Do not strip lines beginning with \"CVS:\" when not using CVS as VC backend."
+  (let (string)
+    (setq string "summary line
+first line
+CVS: Please evaluate your changes and consider the following.
+CVS: Abort checkin if you answer no.
+")
+  (log-edit-done-strip-cvs-lines-helper string string nil)))
+
+(ert-deftest log-edit-done-strip-cvs-lines-only-cvs-colon-blank ()
+  "Strip lines that contain solely \"CVS: \" when using CVS as VC backend."
+  (let (string wanted)
+    (setq string "CVS: \n"
+          wanted "")
+    (log-edit-done-strip-cvs-lines-helper string wanted 'CVS)))
+
+(ert-deftest log-edit-done-strip-cvs-lines-only-cvs-colon ()
+  "Strip lines that contain solely \"CVS:\" when using CVS as VC backend."
+  ;; This test verifies that lines consisting only of "CVS:" (no blank
+  ;; after the colon) are stripped from the commit message.
+  ;; CVS does this to accomodate editors that delete trailing whitespace.
+  (let (string wanted)
+    (setq string "CVS:\n"
+          wanted "")
+    (log-edit-done-strip-cvs-lines-helper string wanted 'CVS)))
+
 ;;; log-edit-tests.el ends here

commit 4db604f3751ffb6a1fc3fd4277445a8f94cec13f
Author: Po Lu <luangruo@yahoo.com>
Date:   Sun Mar 9 13:22:59 2025 +0800

    ; * java/org/gnu/emacs/EmacsWindow.java (viewLayout): Typo in comment.

diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index 861bcace2ad..394b2c26414 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -353,7 +353,7 @@ else if (parent == null)
     /* Otherwise accept the new position offered by the toolkit.  FIXME:
        isn't there a potential race condition here if the toolkit lays
        out EmacsView after a child frame's rect is set but before it
-       calls onLayout to read the modifies rect?  */
+       calls onLayout to read the modified rect?  */
     else
       {
 	rect.left = left;

commit 1e289586fc08615031783a28e1e197071b734aaf
Author: Po Lu <luangruo@yahoo.com>
Date:   Sun Mar 9 13:20:02 2025 +0800

    Avoid reserved names in sfnt.c
    
    * src/sfnt.c (_MIN, _MAX): Rename to INS_MIN and INS_MAX.
    (sfnt_interpret_run): Adjust accordingly.

diff --git a/src/sfnt.c b/src/sfnt.c
index 470cf1f0c88..6728d70dde7 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -7685,7 +7685,7 @@ sfnt_interpret_trap (struct sfnt_interpreter *interpreter,
     PUSH_UNCHECKED (c);				\
   }
 
-#define _MAX()					\
+#define INS_MAX()				\
   {						\
     int32_t e1, e2;				\
 						\
@@ -7695,7 +7695,7 @@ sfnt_interpret_trap (struct sfnt_interpreter *interpreter,
     PUSH_UNCHECKED (MAX (e1, e2));		\
   }
 
-#define _MIN()					\
+#define INS_MIN()				\
   {						\
     int32_t e1, e2;				\
 						\
@@ -12190,11 +12190,11 @@ sfnt_interpret_run (struct sfnt_interpreter *interpreter,
 	  break;
 
 	case 0x8B:  /* MAX */
-	  _MAX ();
+	  INS_MAX ();
 	  break;
 
 	case 0x8C:  /* MIN */
-	  _MIN ();
+	  INS_MIN ();
 	  break;
 
 	  /* Scan or dropout control is not implemented.  Instead, 256

commit 2f1b1414f78e471f1c4e852c1cbd8320cb0fa60d
Author: john muhl <jm@pub.pink>
Date:   Wed Feb 26 10:31:24 2025 -0600

    Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
    
    * lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
    'treesit-thing-settings'.
    * lisp/progmodes/hideshow.el (hs-special-modes-alist):
    Remove regular expression based implementation.
    * test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua: New file.
    * test/lisp/progmodes/lua-ts-mode-tests.el (lua-ts-test-hideshow):
    Add test.  (Bug#76693)

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index c9b43fe8e16..c1d62fb92ab 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -266,7 +266,6 @@ This has effect only if `search-invisible' is set to `open'."
     (java-ts-mode "{" "}" "/[*/]" nil nil)
     (js-mode "{" "}" "/[*/]" nil)
     (js-ts-mode "{" "}" "/[*/]" nil)
-    (lua-ts-mode "{\\|\\[\\[" "}\\|\\]\\]" "--" nil)
     (mhtml-mode "{\\|<[^/>]*?" "}\\|</[^/>]*[^/]>" "<!--" mhtml-forward nil)
     ;; Add more support here.
     )
diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index de93d0fdaba..b4025c23649 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -791,31 +791,39 @@ Calls REPORT-FN directly."
                 (rx (or "function_declaration" "function_definition")))
     (setq-local treesit-thing-settings
                 `((lua
-                   (function ,(rx (or "function_declaration"
-                                      "function_definition")))
+                   (function (or "function_declaration"
+                                 "function_definition"))
                    (keyword ,(regexp-opt lua-ts--keywords 'symbols))
-                   (loop-statement ,(rx (or "do_statement"
-                                            "for_statement"
-                                            "repeat_statement"
-                                            "while_statement")))
+                   (loop-statement (or "do_statement"
+                                       "for_statement"
+                                       "repeat_statement"
+                                       "while_statement"))
                    (sentence (or function
                                  loop-statement
-                                 ,(rx (or "assignment_statement"
-                                          "comment"
-                                          "field"
-                                          "function_call"
-                                          "if_statement"
-                                          "return_statement"
-                                          "variable_declaration"))))
+                                 comment
+                                 "assignment_statement"
+                                 "field"
+                                 "function_call"
+                                 "if_statement"
+                                 "return_statement"
+                                 "variable_declaration"))
                    (sexp (or function
                              keyword
                              loop-statement
-                             ,(rx (or "arguments"
-                                      "parameters"
-                                      "parenthesized_expression"
-                                      "string"
-                                      "table_constructor"))))
-                   (text "comment"))))
+                             "arguments"
+                             "parameters"
+                             "parenthesized_expression"
+                             "string"
+                             "table_constructor"))
+                   (list (or function
+                             loop-statement
+                             "arguments"
+                             "parameters"
+                             "table_constructor"
+                             "parenthesized_expression"
+                             ,(rx bos "if_statement" eos)))
+                   (text (or comment "string"))
+                   (comment ,(rx bos "comment" eos)))))
 
     ;; Imenu/Outline/Which-function.
     (setq-local treesit-simple-imenu-settings
diff --git a/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua b/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua
new file mode 100644
index 00000000000..a4831eba273
--- /dev/null
+++ b/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua
@@ -0,0 +1,43 @@
+--[[
+This is a
+comment block.
+]]
+local function fun ()
+    print("fun")
+end
+local f = (function ()
+    print(1)
+end)
+for i = 1, 10 do
+  print(i)
+end
+repeat
+    print("repeat")
+until false
+while true do
+    print("while")
+end
+do
+    print(1)
+end
+local t = {
+    a=1,
+    b=2,
+}
+if true then
+    print(1)
+elseif false then
+    print(0)
+else
+    print(0)
+end
+function f1 (has,
+             lots,
+             of,
+             parameters)
+    print("ok")
+end
+print(1,
+      2,
+      3,
+      4)
diff --git a/test/lisp/progmodes/lua-ts-mode-tests.el b/test/lisp/progmodes/lua-ts-mode-tests.el
index 44c31648586..b14e9518451 100644
--- a/test/lisp/progmodes/lua-ts-mode-tests.el
+++ b/test/lisp/progmodes/lua-ts-mode-tests.el
@@ -22,6 +22,7 @@
 (require 'ert)
 (require 'ert-font-lock)
 (require 'ert-x)
+(require 'hideshow)
 (require 'treesit)
 (require 'which-func)
 
@@ -48,6 +49,18 @@
     (should (equal "f" (which-function)))
     (which-function-mode -1)))
 
+(ert-deftest lua-ts-test-hideshow ()
+  (skip-unless (treesit-ready-p 'lua t))
+  (with-temp-buffer
+    (insert-file-contents (ert-resource-file "hide-show.lua"))
+    (lua-ts-mode)
+    (hs-minor-mode)
+    (hs-hide-all)
+    (should (= 11 (length (overlays-in (point-min) (point-max)))))
+    (hs-show-all)
+    (should (= 0 (length (overlays-in (point-min) (point-max)))))
+    (hs-minor-mode -1)))
+
 (provide 'lua-ts-mode-tests)
 
 ;;; lua-ts-mode-tests.el ends here

commit 7905ea761ac8405628993708b4c1d4516370067c
Author: Michael Heerdegen <michael_heerdegen@web.de>
Date:   Sun Sep 18 12:26:08 2022 +0200

    Correct (debug body) edebug specs
    
    This fixes Bug#69865.
    
    * lisp/org/ob-exp.el (org-babel-exp--at-source):
    * test/lisp/dired-tests.el (dired-test-with-temp-dirs):
    * test/lisp/emacs-lisp/package-tests.el (with-fake-help-buffer):
    Fix broken edebug specs (debug body) -> (debug (body)).

diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 83b6be8e24d..ab99541ab94 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -65,7 +65,7 @@ to avoid evaluating code on export should use the header argument
 Source is located in `org-babel-exp-reference-buffer'.  The value
 returned is the value of the last form in BODY.  Assume that
 point is at the beginning of the Babel block."
-  (declare (indent 1) (debug body))
+  (declare (indent 1) (debug (body)))
   `(let ((source (get-text-property (point) 'org-reference)))
      ;; Source blocks created during export process (e.g., by other
      ;; source blocks) are not referenced.  In this case, do not move
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index be585d276ec..74732b2087e 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -370,7 +370,7 @@
 
 (defmacro dired-test-with-temp-dirs (just-empty-dirs &rest body)
   "Helper macro for Bug#27940 test."
-  (declare (indent 1) (debug body))
+  (declare (indent 1) (debug (body)))
   (let ((dir (make-symbol "dir")))
     `(ert-with-temp-directory ,dir
        (let* ((dired-deletion-confirmer (lambda (_) "yes")) ; Suppress prompts.
diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index d8e260319bd..f22051774c8 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -168,7 +168,7 @@
 
 (defmacro with-fake-help-buffer (&rest body)
   "Execute BODY in a temp buffer which is treated as the \"*Help*\" buffer."
-  (declare (debug body))
+  (declare (debug (body)))
   `(with-temp-buffer
     (help-mode)
     ;; Trick `help-buffer' into using the temp buffer.

commit f23ee932509e0a67aaafc499f0cd6b25535e4b95
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date:   Thu Feb 20 22:37:13 2025 +0100

    Prevent button.el from clearing help-echo strings
    
    In order to fix one of the issues discussed in bug#61413, i.e.
    'buttonize' clobbering the help-echo property set by
    'icon-string'.
    
    This is a reasonable interpretation of the button.el
    docstrings - "if HELP-ECHO, use that as the `help-echo'
    property"; conversely, if not HELP-ECHO, then do not do
    anything, preserving existing values for that property.
    
    * lisp/button.el (button--properties): Only add a help-echo
    property if HELP-ECHO is non-nil.  Add an additional property
    for bookkeeping.
    (unbuttonize-region): Check for that bookkeeping property
    before clearing help-echo.
    * test/lisp/button-tests.el (button--preserve-help-echo):
    Validate these changes.

diff --git a/lisp/button.el b/lisp/button.el
index 674de1bb4fa..58f00c4c2ad 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -652,15 +652,19 @@ Also see `buttonize-region'."
     string))
 
 (defun button--properties (callback data help-echo)
-  (list 'font-lock-face 'button
-        'mouse-face 'highlight
-        'help-echo help-echo
-        'button t
-        'follow-link t
-        'category t
-        'button-data data
-        'keymap button-map
-        'action callback))
+  (append
+   (list 'font-lock-face 'button
+         'mouse-face 'highlight
+         'button t
+         'follow-link t
+         'category t
+         'button-data data
+         'keymap button-map
+         'action callback)
+   (and help-echo
+        (list 'help-echo help-echo
+              ;; Record that button.el is responsible for this property.
+              'help-echo-button t))))
 
 (defun buttonize-region (start end callback &optional data help-echo)
   "Make the region between START and END into a button.
@@ -681,8 +685,14 @@ This removes both text-property and overlay based buttons."
     (when (overlay-get o 'button)
       (delete-overlay o)))
   (with-silent-modifications
-    (remove-text-properties start end
-                            (button--properties nil nil nil))
+    (remove-text-properties
+     start end
+     (append
+      (button--properties nil nil nil)
+      ;; Only remove help-echo if it was added by button.el.
+      (and (get-text-property start 'help-echo-button)
+           (list 'help-echo nil
+                 'help-echo-button nil))))
     (add-face-text-property start end
                             'button nil)))
 
diff --git a/test/lisp/button-tests.el b/test/lisp/button-tests.el
index 7f6a5bd52cd..b784cf02e28 100644
--- a/test/lisp/button-tests.el
+++ b/test/lisp/button-tests.el
@@ -101,4 +101,32 @@
       (setq button (insert-button "overlay" 'help-echo help))
       (should (equal (button--help-echo button) "overlay: x")))))
 
+(ert-deftest button--preserve-help-echo ()
+  "Ensure buttonizing functions preserve existing `help-echo' properties."
+  ;; buttonize.
+  (let* ((string (propertize "button text" 'help-echo "help text"))
+         (button (buttonize string #'ignore)))
+    (should (equal (get-text-property 0 'help-echo button)
+                   "help text")))
+  ;; buttonize-region.
+  (with-temp-buffer
+    (insert (propertize "button text" 'help-echo "help text"))
+    (buttonize-region (point-min) (point) #'ignore)
+    (should (equal (get-text-property (point-min) 'help-echo)
+                   "help text"))
+    ;; unbuttonize-region should not clear the property either.
+    (unbuttonize-region (point-min) (point))
+    (should (equal (get-text-property (point-min) 'help-echo)
+                   "help text")))
+  ;; unbuttonize-region should still clear properties applied with
+  ;; buttonize.
+  (with-temp-buffer
+    (insert "button text")
+    (buttonize-region (point-min) (point) #'ignore nil "help text")
+    (should (equal (get-text-property (point-min) 'help-echo)
+                   "help text"))
+    (unbuttonize-region (point-min) (point))
+    (should (equal (get-text-property (point-min) 'help-echo)
+                   nil))))
+
 ;;; button-tests.el ends here

commit 269d337f9191cb58e70f93f8aae47a9bd8d635f9
Author: Daniel Colascione <dancol@dancol.org>
Date:   Sat Mar 8 07:38:38 2025 -0800

    Make windmove repetition more robust
    
    Munge this-command when we hit a movement barrier so we override only on
    the very next command instead of at the end of a sequence of movement
    commands that didn't encounter a barrier.
    
    * (windmove-do-window-select): Use last-command to remember that we hit
    a barrier.

diff --git a/lisp/windmove.el b/lisp/windmove.el
index d1b40ef23bd..4d122c08158 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -385,11 +385,13 @@ the second invocation will override the `no-other-window' property.
 CALLING-COMMAND is the command that called this function, used to detect
 repeated commands."
   (let* ((repeated-command
-          (and calling-command (eq last-command calling-command)))
+          (and calling-command
+               windmove-allow-repeated-command-override
+               (eq last-command
+                   (intern (format "%s-override" calling-command)))))
          (other-window (windmove-find-other-window dir arg window)))
 
-    (when (and (null other-window)
-               repeated-command windmove-allow-repeated-command-override)
+    (when (and (null other-window) repeated-command)
       (setf other-window (window-in-direction dir window t arg windmove-wrap-around t)))
 
     ;; Create window if needed
@@ -411,6 +413,11 @@ repeated commands."
                windmove-allow-repeated-command-override)
       (let ((test-window (window-in-direction dir window t arg windmove-wrap-around t)))
         (when test-window
+          ;; Remember that we stopped at a boundary so we don't override
+          ;; a no-other-window before telling the user about it during a
+          ;; multi-command movement sequence.
+          (setf this-command
+                (intern (format "%s-override" calling-command)))
           (user-error "No window %s (repeat to override)" dir))))
 
     (cond ((null other-window)

commit 1a9c2a9505a9e006955294fe2a9a2f93e76d712c
Author: Daniel Colascione <dancol@dancol.org>
Date:   Sat Mar 8 07:04:18 2025 -0800

    Fix documentation for windmove commands
    
    * lisp/windmove.el (windmove-left, windmove-up, windmove-right)
    (windmove-down): Mention correct variable names and align descriptions.

diff --git a/lisp/windmove.el b/lisp/windmove.el
index 2d2ad8ce148..d1b40ef23bd 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -435,7 +435,11 @@ With no prefix argument, or with prefix argument equal to zero,
 it is relative to the top edge (for positive ARG) or the bottom edge
 \(for negative ARG) of the current window.
 If no window is at the desired location, an error is signaled
-unless `windmove-create-window' is non-nil and a new window is created."
+unless `windmove-create-window' is non-nil and a new window is created.
+
+If `windmove-allow-repeated-command-override' is true and this commnad
+stopped because it wouldn't move into a window marked with
+`no-other-window', repeating the command will move into that window."
   (interactive "P\np")
   (windmove-do-window-select
    'left (and arg (prefix-numeric-value arg)) nil
@@ -451,10 +455,9 @@ negative ARG) of the current window.
 If no window is at the desired location, an error is signaled
 unless `windmove-create-window' is non-nil and a new window is created.
 
-When this command is used twice in quick succession (within
-`windmove-double-command-timeout' seconds), the second invocation
-will override the `no-other-window' property of windows, allowing
-you to move to windows that would normally be skipped."
+If `windmove-allow-repeated-command-override' is true and this commnad
+stopped because it wouldn't move into a window marked with
+`no-other-window', repeating the command will move into that window."
   (interactive "P\np")
   (windmove-do-window-select
    'up (and arg (prefix-numeric-value arg)) nil
@@ -470,9 +473,9 @@ bottom edge (for negative ARG) of the current window.
 If no window is at the desired location, an error is signaled
 unless `windmove-create-window' is non-nil and a new window is created.
 
-If `windmove-double-command-timeout' is set and a window exists in the
-requested direction that is marked with the no-other-window property, you
-can press this command twice in quick succession to override that property."
+If `windmove-allow-repeated-command-override' is true and this commnad
+stopped because it wouldn't move into a window marked with
+`no-other-window', repeating the command will move into that window."
   (interactive "P\np")
   (windmove-do-window-select
    'right (and arg (prefix-numeric-value arg)) nil
@@ -486,7 +489,11 @@ With no prefix argument, or with prefix argument equal to zero,
 it is relative to the left edge (for positive ARG) or the right edge
 \(for negative ARG) of the current window.
 If no window is at the desired location, an error is signaled
-unless `windmove-create-window' is non-nil and a new window is created."
+unless `windmove-create-window' is non-nil and a new window is created.
+
+If `windmove-allow-repeated-command-override' is true and this commnad
+stopped because it wouldn't move into a window marked with
+`no-other-window', repeating the command will move into that window."
   (interactive "P\np")
   (windmove-do-window-select
    'down (and arg (prefix-numeric-value arg)) nil

commit b36abc76ae3583ae30f9883ca276ff66d522bac1
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Mar 8 21:58:19 2025 +0800

    ; Enable pdumper on some buggy versions of Sun C
    
    * src/pdumper.c (dump_sort_copied_objects, drain_reloc_list)
    (dump_do_fixups, dump_do_dump_relocation): Do not expand
    Fnreverse multiple times in CALLN.  Sun C 5.12 evaluates the
    arguments to array initializers to which it expands, which
    clobbers the lists being reversed.

diff --git a/src/pdumper.c b/src/pdumper.c
index 7a8c5bba9ad..342c37b5e62 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -3388,13 +3388,16 @@ dump_metadata_for_pdumper (struct dump_context *ctx)
 static void
 dump_sort_copied_objects (struct dump_context *ctx)
 {
+  Lisp_Object queue_reversed;
+
+  queue_reversed = Fnreverse (ctx->copied_queue);
   /* Sort the objects into the order in which they'll appear in the
      Emacs: this way, on startup, we'll do both the IO from the dump
      file and the copy into Emacs in-order, where prefetch will be
      most effective.  */
-  ctx->copied_queue =
-    CALLN (Fsort, Fnreverse (ctx->copied_queue),
-           Qdump_emacs_portable__sort_predicate_copied);
+  ctx->copied_queue
+    = CALLN (Fsort, queue_reversed,
+	     Qdump_emacs_portable__sort_predicate_copied);
 }
 
 /* Dump parts of copied objects we need at runtime.  */
@@ -3959,9 +3962,11 @@ drain_reloc_list (struct dump_context *ctx,
                   struct dump_table_locator *out_locator)
 {
   struct dump_flags old_flags = ctx->flags;
+  Lisp_Object list_reversed, relocs;
   ctx->flags.pack_objects = true;
-  Lisp_Object relocs = CALLN (Fsort, Fnreverse (*reloc_list),
-                              Qdump_emacs_portable__sort_predicate);
+  list_reversed = Fnreverse (*reloc_list);
+  relocs = CALLN (Fsort, list_reversed,
+		  Qdump_emacs_portable__sort_predicate);
   *reloc_list = Qnil;
   dump_align_output (ctx, max (alignof (struct dump_reloc),
 			       alignof (struct emacs_reloc)));
@@ -4082,8 +4087,9 @@ static void
 dump_do_fixups (struct dump_context *ctx)
 {
   dump_off saved_offset = ctx->offset;
-  Lisp_Object fixups = CALLN (Fsort, Fnreverse (ctx->fixups),
-                              Qdump_emacs_portable__sort_predicate);
+  Lisp_Object fixups_reversed = Fnreverse (ctx->fixups);
+  Lisp_Object fixups = CALLN (Fsort, fixups_reversed,
+			      Qdump_emacs_portable__sort_predicate);
   Lisp_Object prev_fixup = Qnil;
   ctx->fixups = Qnil;
   while (!NILP (fixups))
@@ -5430,8 +5436,8 @@ dump_do_dump_relocation (const uintptr_t dump_base,
     case RELOC_NATIVE_COMP_UNIT:
       {
 	static enum { UNKNOWN, LOCAL_BUILD, INSTALLED } installation_state;
-	struct Lisp_Native_Comp_Unit *comp_u =
-	  dump_ptr (dump_base, reloc_offset);
+	struct Lisp_Native_Comp_Unit *comp_u
+	  = dump_ptr (dump_base, reloc_offset);
 	comp_u->lambda_gc_guard_h = CALLN (Fmake_hash_table, QCtest, Qeq);
 	if (STRINGP (comp_u->file))
 	  error ("trying to load incoherent dumped eln file %s",

commit b0b7ad24e6efca04a373a4f2845a483984e3f1ea
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Mar 8 20:42:49 2025 +0800

    Don't lose drag-and-drop data intended for XTerm-like programs
    
    * src/xselect.c (x_own_selection): If special values exist for
    drag-and-drop to unsupported programs, retain them till the
    selection is cleared.

diff --git a/src/xselect.c b/src/xselect.c
index 5e494a2ca22..5497a98e61d 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -299,10 +299,17 @@ x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value,
     Lisp_Object selection_data;
     Lisp_Object prev_value;
 
+    prev_value = LOCAL_SELECTION (selection_name, dpyinfo);
+
+    /* If the previous value contains alternative data for responding to
+       programs that do not understand a specialized drag-and-drop
+       protocol and DND_DATA is unset, transfer it to the new value.  */
+    if (NILP (dnd_data) && !NILP (prev_value))
+      dnd_data = XCAR (XCDR (XCDR (XCDR (XCDR (prev_value)))));
+
     selection_data = list5 (selection_name, selection_value,
 			    INT_TO_INTEGER (timestamp), frame,
 			    dnd_data);
-    prev_value = LOCAL_SELECTION (selection_name, dpyinfo);
 
     tset_selection_alist
       (dpyinfo->terminal,

commit d2445c8c23595efdd444fce6f0c33ba66b596812
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Mar 8 11:31:22 2025 +0200

    Fix crash in daemon when "C-x C-c" while a client frame shows tooltip
    
    * src/frame.c (delete_frame): Ignore tooltip frames when looking
    for other frames on the same terminal.  (Bug#76842)

diff --git a/src/frame.c b/src/frame.c
index 895caed5513..1a5c2f5c3d4 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2756,17 +2756,19 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 	  struct frame *f1 = XFRAME (frame1);
 
 	  /* Set frame_on_same_kboard to frame1 if it is on the same
-	     keyboard.  Set frame_with_minibuf to frame1 if it also
-	     has a minibuffer.  Leave the loop immediately if frame1
-	     is also minibuffer-only.
+	     keyboard and is not a tooltip frame.  Set
+	     frame_with_minibuf to frame1 if it also has a minibuffer.
+	     Leave the loop immediately if frame1 is also
+	     minibuffer-only.
 
-	     Emacs 26 does _not_ set frame_on_same_kboard here when it
-	     finds a minibuffer-only frame and subsequently fails to
+	     Emacs 26 did _not_ set frame_on_same_kboard here when it
+	     found a minibuffer-only frame, and subsequently failed to
 	     set default_minibuffer_frame below.  Not a great deal and
-	     never noticed since make_frame_without_minibuffer creates
-	     a new minibuffer frame in that case (which can be a minor
-	     annoyance though).  To consider for Emacs 26.3.  */
-	  if (kb == FRAME_KBOARD (f1))
+	     never noticed since make_frame_without_minibuffer created a
+	     new minibuffer frame in that case (which can be a minor
+	     annoyance though).  */
+	  if (!FRAME_TOOLTIP_P (f1)
+	      && kb == FRAME_KBOARD (f1))
 	    {
 	      frame_on_same_kboard = frame1;
 	      if (FRAME_HAS_MINIBUF_P (f1))

commit 1bb91adea519b3e4d99f1064b8095a184e16d009
Author: Sean Whitton <spwhitton@spwhitton.name>
Date:   Sat Mar 8 17:14:54 2025 +0800

    ; windmove-allow-repeated-command-override: Improve docstring

diff --git a/lisp/windmove.el b/lisp/windmove.el
index 88895d43d79..2d2ad8ce148 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -179,7 +179,11 @@ by invoking the same movement command twice in succession when
   :version "28.1")
 
 (defcustom windmove-allow-repeated-command-override t
-  "Control whether pressing the same windmove command twice overrides the no-other-window property."
+  "If non-nil, using windmove commands twice overrides `no-other-window'.
+Normally, the `no-other-window' window property prevents windmove
+commands from moving to that window.  When this variable is non-nil,
+invoking the command twice means the second invocation ignores the
+property."
   :type 'boolean
   :version "31.1")
 

commit a546225e1a86f16188897edef899a48f3c78e136
Author: Sean Whitton <spwhitton@spwhitton.name>
Date:   Sat Mar 8 17:09:30 2025 +0800

    vc-log-internal-common: Kill all local variables
    
    * lisp/vc/vc.el (vc-log-internal-common): Kill all local
    variables, even permanent-local ones (bug#44698).

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bc96173d198..9a58cd87990 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2990,6 +2990,9 @@ Each function runs in the log output buffer without args.")
 			       rev-buff-func)
   (let (retval (buffer (get-buffer-create buffer-name)))
     (with-current-buffer buffer
+      ;; Ensure we drop any directory-local variables from the last
+      ;; directory from which a log buffer was generated (bug#44698).
+      (kill-all-local-variables 'kill-permanent)
       (setq-local vc-log-view-type type))
     (setq retval (funcall backend-func backend buffer-name type files))
     (with-current-buffer buffer

commit 9bb2fe22dba96e800d1882bdebb904160c5a00fb
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Mar 8 10:29:32 2025 +0200

    ; Fix wording of a recently-added NEWS entry.

diff --git a/etc/NEWS b/etc/NEWS
index c384b226ad4..db49c4cde67 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -206,10 +206,12 @@ Several functions to modify the window layout have been added:
 'transpose-window-layout', 'rotate-windows', and 'rotate-windows-back'.
 
 +++
-*** New user option 'windmove-allow-repeated-command-override'.
-This option controls whether pressing the same windmove command twice
-overrides the no-other-window property, allowing navigation to windows
-that would normally be skipped.
+*** Windmove commands now move to skipped windows if invoked twice in a row.
+The new user option 'windmove-allow-repeated-command-override' controls
+this behavior: if it's non-nil, invoking the same windmove command twice
+overrides the 'no-other-window' property, allowing navigation to windows
+that would normally be skipped.  The default is t; customize it to nil
+if you want the old behavior.
 
 +++
 *** New hook 'window-deletable-functions'.