From 44a770b87137c93f0c4af4d203bb071659a603a0 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 1 Mar 2025 15:45:57 +0200
Subject: [PATCH 1/3] ; Improve documentation of 'rmail-movemail-program'

* lisp/mail/rmail.el (rmail-movemail-program):
* doc/emacs/rmail.texi (Movemail): Document how to change the
value of 'rmail-movemail-program' safely.  (Bug#76595)
---
 doc/emacs/rmail.texi | 5 ++++-
 lisp/mail/rmail.el   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 402386684ae..229dc6e3e33 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1527,7 +1527,10 @@ This is equivalent to specifying the @samp{file} protocol:
 absolute file name of the @command{movemail} executable.  If it is
 @code{nil}, Rmail searches for @command{movemail} in the directories
 listed in @code{rmail-movemail-search-path}, then in @code{exec-path}
-(@pxref{Shell}), then in @code{exec-directory}.
+(@pxref{Shell}), then in @code{exec-directory}.  This variable should be
+customized before starting Rmail; if you customize it after starting
+Rmail, you will need to set @code{rmail-movemail-variant-in-use} to the
+@code{nil} value, and then restart Rmail.
 
 @node Remote Mailboxes
 @section Retrieving Mail from Remote Mailboxes
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index c9c8b0f298e..41d177baf32 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -177,7 +177,10 @@ Its name should end with a slash."
   :group 'rmail)
 
 (defcustom rmail-movemail-program nil
-  "If non-nil, the file name of the `movemail' program."
+  "If non-nil, the file name of the `movemail' program.
+If you customize this after starting Rmail, reset the
+variable `rmail-movemail-variant-in-use' to the nil value,
+and then restart Rmail."
   :group 'rmail-retrieve
   :type '(choice (const nil) string))
 

From 8481170eb296780b404caea587d17ab33a24aaeb Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 1 Mar 2025 16:04:52 +0200
Subject: [PATCH 2/3] Fix 'M-q' in 'makefile-mode'

* lisp/progmodes/make-mode.el (makefile-mode-map): Bind 'M-q' to
'fill-paragraph', as 'prog-mode's default binding is not
appropriate for Makefile's syntax.  (Bug#76641)
---
 lisp/progmodes/make-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 37dc9a98506..3996284dd21 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -574,6 +574,7 @@ The function must satisfy this calling convention:
   "C-c RET C-p" #'makefile-makepp-mode
   "M-p"         #'makefile-previous-dependency
   "M-n"         #'makefile-next-dependency
+  "M-q"         #'fill-paragraph
   "C-M-i"       #'completion-at-point)
 
 (when makefile-electric-keys

From 0460177451d86460c0a028f07458e78087181f82 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 1 Mar 2025 16:42:50 +0200
Subject: [PATCH 3/3] ; * lisp/progmodes/java-ts-mode.el (treesit-node-end):
 Declare.

---
 lisp/progmodes/java-ts-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 849ab23ef3e..a4f33948ae9 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -37,6 +37,7 @@
 (declare-function treesit-node-type "treesit.c")
 (declare-function treesit-node-child-by-field-name "treesit.c")
 (declare-function treesit-node-child-by-field-name "treesit.c")
+(declare-function treesit-node-end "treesit.c")
 (declare-function treesit-query-capture "treesit.c")
 
 (defcustom java-ts-mode-indent-offset 4