Merge from origin/emacs-30

b68b9f291cc ; * lisp/progmodes/csharp-mode.el (treesit-query-compile)...
688201ef18d ; * lisp/window.el (switch-to-prev-buffer-skip-regexp): D...
ba44fc9a447 Restore comment/string check for 'electric-layout-mode'
5a462948e13 Update Arni Magnusson's email address
6b1271b169a Fix python-ts-mode-map docstring
aaaafddc945 Normalize "Commentary" section in eudc.el
d656be9794d Expand email abbrevs in X-Debbugs-Cc header.
e9dcf0c57dd Fix 'list-tags' when invoked from a non-file buffer
51ef05f684c count-windows: Fix reference to walk-windows
5eaf0c784bf * lisp/info-look.el (mapc): Add use-package manual's index.
705a5a1a9e6 ; * ChangeLog.4: Fix attribution of one change.
bf26ff0dc8d Update csharp-ts-mode font-lock (bug#73369)
4c866abab96 ; * doc/lispref/variables.texi (Creating Buffer-Local): F...
d42d7d474fe ; * lisp/doc-view.el (doc-view-svg-face): Copy-edit docst...
f46f476bb8f ; * admin/MAINTAINERS: Take VC subsystem, add note about ...
d68e6d2689d ; rcirc-update-activity-string: Justify some existing beh...
e6a37869c8d Fix inconsistency in value of rcirc-activity-string
108b3179bd4 Revert "; Minor clarification in variables.texi"
44156c21407 ; Minor clarification in variables.texi
63058e1153a Tag interactive commands in 'lua-ts-mode'
84bea20eba2 ; * lisp/info-look.el: Add two more links.
96b87ad5363 Mention LSP acronym in eglot defgroup docstring
9c904e8ceae Change :group of 'eglot' defgroup to 'tools'
fd1a1b07805 Remove out-of-date documentation from python.el
11e3e0cadd4 Fix executing commands in Eshell using "env" with no loca...
c0ef8a9a1b3 Fix a typo in the calendar manual
36ff7138feb ; Fix a thinko in sieve-manage.el
7abecbcd633 ; * nt/INSTALL: Update MinGW notes URL.  (Bug#73528)

# Conflicts:
#	admin/MAINTAINERS

5 files changed, 12 insertions, 13 deletions

diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index f511b789796..f6de2e77135 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -106,7 +106,7 @@ commands for moving by characters and by lines.  Just as @kbd{C-n}
 usually moves to the same column in the following line, in Calendar
 mode it is bound to @code{calendar-forward-week}, which moves to the
 same day in the following week.  And @kbd{C-p}
-(@code{calendar-backward-week} moves to the same day in the previous
+(@code{calendar-backward-week}) moves to the same day in the previous
 week.  @kbd{C-f} (@code{calendar-forward-day}) and @kbd{C-b}
 (@code{calendar-backward-day}) move forward and back by days.
 
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 0ec2385860b..4ac751a71af 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2673,14 +2673,13 @@ loaded, this command can use it to generate completion candidates.
 @xref{Symbol Completion}.
 
 @findex list-tags
-  @kbd{M-x list-tags} reads the name of one of the files covered by
-the selected tags table, and displays a list of tags defined in that
-file.  Do not include a directory as part of the file name unless the
-file name recorded in the tags table includes a directory.  This
-command works only with the etags backend, and requires a tags table
-for the project to be available.  @xref{Tags Tables}.  If used
-interactively, the default tag is file name of the current buffer if
-used interactively.
+  @kbd{M-x list-tags} reads the name of one of the files covered by the
+selected tags table, with completion, and displays the list of tags
+defined in that file; it offers the current buffer's file name as the
+default file whose tags to list.  Do not include a directory as part of
+the file name unless the file name recorded in the tags table includes a
+directory.  This command works only with the etags backend, and requires
+a tags table for the project to be available.  @xref{Tags Tables}.
 
 @findex tags-next-file
   @kbd{M-x tags-next-file} visits files covered by the selected tags table.
diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1
index e2d4c019b4a..a508ad9f28b 100644
--- a/doc/lispref/ChangeLog.1
+++ b/doc/lispref/ChangeLog.1
@@ -5551,7 +5551,7 @@
         * loading.texi (Hooks for Loading): Document after-load-functions.
         Copyedits.
 
-2010-03-24  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+2010-03-24  Arni Magnusson  <thisisarni@gmail.com>  (tiny change)
 
         * frames.texi (Cursor Parameters): Fix typo.  (Bug#5760)
 
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 76f15b2595c..af11e498d86 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1732,11 +1732,11 @@ buffer-local variables interactively.
 @defun kill-all-local-variables &optional kill-permanent
 This function eliminates all the buffer-local variable bindings of the
 current buffer.  As a result, the buffer will see the default values
-of most variables.  By default, for variables marked as permanent and
+of most variables.  By default, variables marked as permanent and
 local hook functions that have a non-@code{nil}
 @code{permanent-local-hook} property (@pxref{Setting Hooks}) won't be
 killed, but if the optional @var{kill-permanent} argument is
-non-@code{nil}, even these variables will be killed.
+non-@code{nil}, even those variables will be killed.
 
 This function also resets certain other information pertaining to the
 buffer: it sets the local keymap to @code{nil}, the syntax table to the
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index 37b304c2dca..14570bb174f 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -6407,7 +6407,7 @@
         * epa.texi (Mail-mode integration): Mention the way to do
         "encrypt-to-self".  (Bug#1807)
 
-2009-02-05  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+2009-02-05  Arni Magnusson  <thisisarni@gmail.com>  (tiny change)
 
         * ada-mode.texi (No project files): Fix typo.  (Bug#2214)