From d78a4c0f4cb534dd5b1dc8cfe91f34b6d2c996d3 Mon Sep 17 00:00:00 2001
From: Jared Finder <jared@finder.org>
Date: Sat, 8 Feb 2025 19:08:05 -0800
Subject: [PATCH 1/5] ; * etc/PROBLEMS: Document problem with GPM mouse display
 (bug#74220).

---
 etc/PROBLEMS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 49e9248c688..366c9e4140c 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2815,6 +2815,19 @@ set the 'visible-cursor' variable to nil in your ~/.emacs:
 Still other way is to change the "cvvis" capability to send the
 "\E[?25h\E[?0c" command.
 
+*** GNU/Linux: GPM mouse does not display but still otherwise works.
+
+This happens on Linux kernel versions from 6.7 to 6.13.  On these
+versions, the Linux kernel does not allow programs to draw the mouse
+pointer unless they have superuser permissions.  The GPM daemon
+normally has such permissions and it draws the mouse pointer for other
+programs such as your shell and many ncurses based programs, but not
+for Emacs.
+
+To solve this, you need to change your kernel to a version with this bug
+fixed, such as 6.14.  See associated Linux kernel fix:
+https://lore.kernel.org/regressions/20250110142122.1013222-1-gnoack@google.com/
+
 ** FreeBSD
 
 *** FreeBSD: Getting a Meta key on the console.

From 798ce492d51d16204a28820eb0c8d61fdc8a49e7 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 9 Feb 2025 09:17:31 +0200
Subject: [PATCH 2/5] ; * etc/PROBLEMS: Fix last change (bug#74220).

---
 etc/PROBLEMS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 366c9e4140c..1f44c38ee3a 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2815,7 +2815,7 @@ set the 'visible-cursor' variable to nil in your ~/.emacs:
 Still other way is to change the "cvvis" capability to send the
 "\E[?25h\E[?0c" command.
 
-*** GNU/Linux: GPM mouse does not display but still otherwise works.
+*** GNU/Linux: GPM mouse does not display pointer, but otherwise works.
 
 This happens on Linux kernel versions from 6.7 to 6.13.  On these
 versions, the Linux kernel does not allow programs to draw the mouse
@@ -2825,7 +2825,7 @@ programs such as your shell and many ncurses based programs, but not
 for Emacs.
 
 To solve this, you need to change your kernel to a version with this bug
-fixed, such as 6.14.  See associated Linux kernel fix:
+fixed, such as 6.14 or later.  See associated Linux kernel fix:
 https://lore.kernel.org/regressions/20250110142122.1013222-1-gnoack@google.com/
 
 ** FreeBSD

From f599860b50ecd288144987ff9de40ca3b40a417b Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 9 Feb 2025 16:26:48 +0100
Subject: [PATCH 3/5] =?UTF-8?q?;=20*=20.mailmap:=20Add=20Felici=C3=A1n=20N?=
 =?UTF-8?q?=C3=A9meth.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index bbfe4bceba1..83e94049272 100644
--- a/.mailmap
+++ b/.mailmap
@@ -67,6 +67,7 @@ Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
 Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <galli.87@gmail.com>
+Felicián Németh <felician.nemeth@gmail.com>
 Francis Litterio <flitterio@gmail.com>
 Gabor Vida <vidagabor@gmail.com>
 Gerd Möllmann <gerd@gnu.org>

From 317a5015f8a561317da829f3430829a3ef8a4d13 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 10 Feb 2025 01:31:30 +0100
Subject: [PATCH 4/5] ; * .mailmap: Add a few more entries.

---
 .mailmap | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 83e94049272..f1caf77cbc0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,9 @@ Andrea Corallo <akrl@sdf.org>
 Andrea Corallo <akrl@sdf.org> <akrl@sdf.com>
 Andrea Corallo <akrl@sdf.org> <andcor03@e112547.nice.arm.com>
 Andrea Corallo <akrl@sdf.org> <andrea_corallo@yahoo.it>
+Andrea Corallo <andrea.corallo@arm.com> <andcor03@e112547.nice.arm.com>
+Andrea Corallo <andrea.corallo@arm.com> <andcor03@e130743.arm.com>
+Andrea Corallo <andrea.corallo@arm.com> <andcor03@e132096.arm.com>
 Andrew G Cohen <cohen@andy.bu.edu>
 Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
 Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
@@ -79,14 +82,17 @@ Gnus developers <ding@gnus.org.noreply> <ding@gnus.org>
 Gregory Heytings <gregory@heytings.org> <ghe@sdf.org>
 Grégoire Jadi <daimrod@gmail.com>
 Ian Dunn <dunni@gnu.org>
+Ignacio Casso <ignaciocasso@hotmail.com>
 Jan Djärv <jan.h.d@swipnet.se>
 Jan Djärv <jan.h.d@swipnet.se> <jhd@f20.localdomain>
+Jan Synáček <jan.synacek@gmail.com>
 Jason Rumney <jasonr@gnu.org> <jasonr@wanchan>
 Jeff Walsh <fejfighter@gmail.com> <jawalsh@localhost.localdomain>
 Jeff Walsh <fejfighter@gmail.com> <jeff.walsh@drtusers-MacBook-Pro.local>
 Jeff Walsh <fejfighter@gmail.com> <jewalsh@redhat.com>
 Jens Lechtenbörger <jens.lechtenboerger@fsfe.org>
 Jim Blandy <jimb@red-bean.com> <jimb@redhat.com>
+Jim Meyering  <meyering@redhat.com> U. Ser <user@example.com>
 Jimmy Aguilar Mena <spacibba@aol.com>
 Joakim Verona <joakim@verona.se>
 Joakim Verona <joakim@verona.se> <root@exodia.verona.se>
@@ -151,6 +157,7 @@ Philip Kaludercic <philipk@posteo.net> <philip.kaludercic@fau.de>
 Philip Kaludercic <philipk@posteo.net> <philip@icterid>
 Philip Kaludercic <philipk@posteo.net> <philip@warpmail.net>
 Philipp Stephani <p.stephani2@gmail.com>
+Philipp Stephani <phst@google.com>
 Phillip Lord <phillip.lord@russet.org.uk> <phillip.lord@newcastle.ac.uk>
 Pierre Lorenzon <devel@pollock-nageoire.net>
 Pieter van Oostrum <pieter@vanoostrum.org> <pieter-l@vanoostrum.org>
@@ -158,8 +165,9 @@ Pip Cet <pipcet@gmail.com>
 Po Lu <luangruo@yahoo.com>
 Po Lu <luangruo@yahoo.com> Po Lu via <emacs-devel@gnu.org>
 Przemysław Wojnowski <esperanto@cumego.com>
-Rasmus <rasmus@gmx.us>
+Rasmus Pank Roulund <rasmus@gmx.us>
 Richard M. Stallman <rms@gnu.org>
+Robert Brown <robert.brown@gmail.com>
 Robert J. Chassell <bob@gnu.org> <bob@rattlesnake.com>
 Robert Weiner <rsw@gnu.org> <rswgnu@gmail.com>
 Roland Winkler <winkler@gnu.org> <Roland.Winkler@physik.uni-erlangen.de>

From 411db5543274275896ff4bf93096e9fd5574d06e Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 10 Feb 2025 15:35:20 -0500
Subject: [PATCH 5/5] lisp/help.el (help-function-arglist): Fix out-of-bounds
 access (bug#76179)

---
 lisp/help.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/help.el b/lisp/help.el
index 5d4c3e61599..1d87c2209c8 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -2381,7 +2381,7 @@ the same names as used in the original source code, when possible."
             (dolist (arg arglist)
               (unless (and (symbolp arg)
                            (let ((name (symbol-name arg)))
-                             (if (eq (aref name 0) ?&)
+                             (if (and (> (length name) 0) (eq (aref name 0) ?&))
                                  (memq arg '(&rest &optional))
                                (not (string-search "." name)))))
                 (setq valid nil)))