4 files changed, 382 insertions, 22 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 1838a1ec3e5..243feba3c0e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -62,7 +62,7 @@ You can keep the old behavior by putting '(xterm-mouse-mode -1)' in your
 init file.
 
 +++
-** 'site-start.el' is now loaded before the user's early init file.
+** site-start.el is now loaded before the user's early init file.
 Previously, the order was early-init.el, site-start.el and then the
 user's regular init file, but now site-start.el comes first.  This
 allows site administrators to customize things that can normally only be
@@ -84,9 +84,9 @@ other directory on your system.  You can also invoke the
 
 +++
 ** 'line-spacing' now supports specifying spacing above the line.
-Previously, only spacing below the line could be specified.  The variable
-can now be set to a cons cell to specify spacing both above and below
-the line, which allows for vertically centering text.
+Previously, only spacing below the line could be specified.  The user
+option can now be set to a cons cell to specify spacing both above and
+below the line, which allows for vertically centering text.
 
 +++
 ** 'prettify-symbols-mode' attempts to ignore undisplayable characters.
@@ -726,6 +726,11 @@ If the value of 'project-mode-line' is 'non-remote', project name and
 the Project menu will be shown on the mode line only for projects with
 local files.
 
+*** The "VC-aware" project backend caches the current project and its name.
+The duration for which the values are cached depends on whether it's
+called from 'non-essential' context, and it determined by variables
+'project-vc-cache-timeout' and 'project-vc-non-essential-cache-timeout'.
+
 ** Help
 
 +++
@@ -853,10 +858,10 @@ Northern Iroquoian language family: 'mohawk-postfix' (Mohawk
 [Kanien’kéha / Kanyen’kéha / Onkwehonwehnéha]), 'oneida-postfix' (Oneida
 [Onʌyote’a·ká· / Onyota’a:ká: / Ukwehuwehnéha]), 'cayuga-postfix'
 (Cayuga [Gayogo̱ho:nǫhnéha:ˀ]), 'onondaga-postfix' (Onondaga
-[Onųdaʔgegáʔ]), and 'seneca-postfix' (Seneca [Onödowá’ga:’]).
-Additionally, there is a general-purpose 'haudenosaunee-postfix' input
-method to facilitate writing in the orthographies of the five languages
-simultaneously.
+[Onųdaʔgegáʔ]), 'seneca-postfix' (Seneca [Onödowá’ga:’]), and
+'tuscarora-postfix' (Tuscarora [Skarù·ręʔ]).  Additionally, there is a
+general-purpose 'haudenosaunee-postfix' input method to facilitate
+writing in the orthographies of the six languages simultaneously.
 
 ---
 *** New input methods for languages based on Burmese.
@@ -1410,7 +1415,7 @@ is non-nil, this suffix is fontified using 'font-lock-type-face'.
 
 ---
 *** New user option 'yaml-ts-mode-yamllint-options'.
-Additional options for 'yamllint' the command used for Flymake's YAML
+Additional options for 'yamllint', the command used for Flymake's YAML
 support.
 
 ** EIEIO
@@ -1782,6 +1787,14 @@ response.
 It is believed to no longer be useful as a method to fight spam.  The
 'spam-use-hashcash' hook is now obsolete and has no effect.
 
+---
+*** Add 'M-i' keybinding as the symbolic prefix in the group keymap.
+The symbolic prefix is another kind of universal prefix that is used in
+Gnus, see "(gnus) Symbolic Prefixes" in the Gnus manual.
+
+---
+*** Sorting selected groups is now possible with 'gnus-topic-mode'.
+
 ** Sieve
 
 +++
@@ -2087,6 +2100,11 @@ for docstrings where symbols 'nil' and 't' are in quotes.
 In most cases, having it enabled leads to a large amount of false
 positives.
 
+---
+*** New function 'checkdoc-batch'.
+It checks the buffer in batch mode, prints all found errors
+and signals the first found error.
+
 *** New file-local variable 'lisp-indent-local-overrides'.
 This variable can be used to locally override the indent specification
 of symbols.
@@ -2165,6 +2183,12 @@ To unconditionally enable 'flyspell-mode' from a hook, use this instead:
 ** Tramp
 
 +++
+*** Tramp signals 'remote-file-error' in case of connection problems.
+This is a subcategory of 'file-error'.  Therefore, all checks for
+'file-error' in 'condition-case', 'ignore-error', 'error-conditions' and
+alike still work.
+
++++
 *** New command 'tramp-cleanup-bufferless-connections'.
 Connection-related objects for which no associated buffers exist, except
 for Tramp internal buffers, are flushed.  This is helpful to prune
@@ -2279,15 +2303,19 @@ one as before.  This makes them different from 'vc-diff' and
 *** 'diff-apply-hunk' now supports creating and deleting files.
 
 +++
-*** 'diff-apply-hunk' and 'diff-apply-buffer' now consider the region.
-If the region is active, these commands now apply all hunks that the
-region overlaps.  Otherwise, they have their existing behavior.
+*** Diff mode's application and killing commands now consider the region.
+If the region is active, 'diff-apply-hunk', 'diff-apply-buffer' and
+'diff-hunk-kill' now apply or kill all hunks that the region overlaps.
+Otherwise, they have their existing behavior.
 
 +++
 *** 'diff-apply-buffer' can reverse-apply.
 With a prefix argument, it now reverse-applies hunks.
 This matches the existing prefix argument to 'diff-apply-hunk'.
 
+---
+*** 's' is now bound to 'diff-split-hunk' in read-only Diff mode buffers.
+
 ** Ediff
 
 +++
@@ -2499,6 +2527,12 @@ When point is between indentation, the command
 deletes the text in the region and deactivates the mark if Transient
 Mark mode is enabled, the mark is active, and prefix argument is 1.
 
+---
+*** 'python-eldoc-function-timeout' now accepts floating-point numbers.
+To allow for finer-grained adjustment of timeout for
+'python-eldoc-function', 'python-eldoc-function-timeout' now accepts
+floating-point numbers as well as integers.
+
 ** Tmm Menubar
 
 ---
@@ -2620,7 +2654,7 @@ When the argument is non-nil, the function switches to a buffer visiting
 the directory into which the repository was cloned.
 
 +++
-*** 'vc-revert' is now bound to '@' in VC-Dir.
+*** 'vc-revert' is now bound to '@' in VC Directory.
 
 +++
 *** 'vc-revert' is now additionally bound to 'C-x v @'.
@@ -2762,7 +2796,7 @@ base with the remote branch, including uncommitted changes.
 ('vc-root-log-outgoing-base') show the corresponding revision logs.
 These are useful to view all outstanding (unmerged, unpushed) changes on
 the current branch.  They are also available as 'T =', 'T D', 'T l' and
-'T L' in VC-Dir buffers.
+'T L' in VC Directory buffers.
 
 +++
 *** New user option 'vc-use-incoming-outgoing-prefixes'.
@@ -2876,6 +2910,13 @@ This command is Diff mode's specialized 'narrow-to-region'.
 consistency, 'diff-restrict-view' is now too.
 To enable it again, use 'M-x enable-command'.
 
+---
+*** 'C-x v !' has its own input history.
+
+---
+*** 'C-u C-x v +' and 'C-u C-x v P' for Git have an input history.
+This was already in place for Mercurial.
+
 ** Package
 
 +++
@@ -2947,6 +2988,17 @@ The package review can include reading the downloaded source code,
 presenting a diff between the downloaded code and a previous
 installation or displaying a ChangeLog.
 
++++
+*** New command 'package-autosuggest'
+Using a built-in database of package suggestions from ELPA, this command
+will install viable packages if no specific major mode is available.
+
++++
+*** New minor mode 'package-autosuggest-mode'
+When enabled, this displays a hint in the mode line indicating the
+availability of a suggested package.  You can customise the presentation
+of these hints using 'package-autosuggest-style'.
+
 ** Rcirc
 
 +++
@@ -3057,9 +3109,19 @@ Meant to be given a global binding convenient to the user.  Example:
 
 ** Icomplete
 
-*** New key 'M-j' for 'icomplete-mode' and 'icomplete-vertical-mode'.
-Like 'M-j' in 'fido-mode', it can exit the minibuffer with a selected
-candidate even when 'icomplete-show-matches-on-no-input' is non-nil.
+*** Change in meaning of 'icomplete-show-matches-on-no-input' (again).
+For Emacs 28 to Emacs 30, when 'icomplete-show-matches-on-no-input' was
+non-nil, 'RET' had special behavior when the minibuffer's contents was
+equal to the initial input it had right after minibuffer activation.
+In that case, 'RET' would choose the first completion candidate, if
+there was one, instead of the minibuffer's default value.
+'RET' has now returned to selecting the default value in this case; you
+can use 'C-j' to choose the completion under point instead.
+You can opt back in to the special behavior of 'RET' like this:
+
+    (keymap-set
+      icomplete-minibuffer-map "<remap> <minibuffer-complete-and-exit>"
+      #'icomplete-ret)
 
 *** New user options for 'icomplete-vertical-mode'.
 New user options have been added to enhance 'icomplete-vertical-mode':
@@ -3303,6 +3365,34 @@ The user options 'calendar-mark-holidays-flag' and
 'calendar-mark-diary-entries-flag' are not modified anymore when
 changing the marking state in the calendar buffer.
 
+*** New library for iCalendar data.
+A new library has been added to the calendar for handling iCalendar
+(RFC5545) data.  The library is designed for reuse in other parts of
+Emacs and in third-party packages.  Package authors can find the new
+library in the Emacs distribution under "lisp/calendar/icalendar-*.el".
+
+Most of the functions and variables in the older icalendar.el have been
+marked obsolete and now suggest appropriate replacements from the new
+library.  diary-icalendar.el provides replacements for the diary-related
+features from icalendar.el; see below.
+
+** Diary
+
+*** New user option 'diary-date-insertion-form'.
+This user option determines how dates are inserted into the diary by
+Lisp functions.  Its value is a pseudo-pattern of the same type as in
+'diary-date-forms'.  It is used by 'diary-insert-entry' when inserting
+entries from the calendar, or when importing them from other formats.
+
++++
+*** New library 'diary-icalendar'.
+This library reimplements features previously provided by icalendar.el:
+import from iCalendar format to the diary, and export from the diary to
+iCalendar.  It also adds the ability to include iCalendar files in the
+diary and display and mark their contents in the calendar without
+importing them to the diary file.  The library uses the new iCalendar
+library (see above) and makes diary import and export more customizable.
+
 ** Calc
 
 *** New user option 'calc-string-maximum-character'.
@@ -3329,6 +3419,11 @@ each refresh.  The sort direction can be controlled by using a cons cell
 of a format string and a boolean.  Alternatively, a sorting function can
 be provided directly.
 
+---
+*** New user option 'display-time-help-echo-format'.
+This option controls the format of the help echo when hovering over the
+time.
+
 ** Fill
 
 +++
@@ -3467,9 +3562,25 @@ value.  Previously, only 'hi-lock-face-buffer' supported this.
 
 *** 'shadow-info-buffer' and 'shadow-todo-buffer' use ephemeral buffer names now.
 
+** Display Battery mode
+
+---
+*** UPower battery status can update automatically without polling.
+On systems where the user option 'battery-status-function' is set to
+'battery-upower', it is now possible to get battery status updates on
+the mode line without polling for changes every
+'battery-update-interval' seconds.  Setting this user option to nil
+means the mode line will update only when the battery power state,
+percentage, or presence in the bay changes.
+
 
 * New Modes and Packages in Emacs 31.1
 
+** New major mode 'icalendar-mode'.
+A major mode for displaying and editing iCalendar (RFC5545) data.  This
+mode handles line unfolding and fontification, including highlighting
+syntax errors in invalid data.
+
 ** New minor mode 'delete-trailing-whitespace-mode'.
 A simple buffer-local mode that runs 'delete-trailing-whitespace'
 before saving the buffer.
@@ -3516,6 +3627,23 @@ On GNU/Linux systems, shell extensions or similar helpers such as
 <https://extensions.gnome.org/extension/307/dash-to-dock/> and
 <https://wiki.ubuntu.com/Unity/LauncherAPI>.
 
++++
+** New package 'system-sleep'.
+This package provides platform-neutral interfaces to block your system
+from entering idle sleep and a hook to process pre-sleep and post-wake
+events.  You can use this to avoid the system entering an idle sleep
+state and interrupting a long-running process due to lack of user
+activity.  The sleep event hook lets you, for example, close external
+connections or serial ports before sleeping, and reestablish them when
+the system wakes up.
+
+Supported capable systems are GNU/Linux via D-Bus (sleep blocking and
+sleep events require the org.freedesktop.login1 service, display sleep
+blocking requires org.freedesktop.Screensaver service), macOS
+(sleep/display blocking requires version 10.9 or later, sleep events are
+supported on all versions), MS-Windows (sleep blocking is supported on
+all versions, sleep events require Windows 8 or later).
+
 
 * Incompatible Lisp Changes in Emacs 31.1
 
@@ -3676,6 +3804,20 @@ display time or even cause Emacs to hang trying to display such a face.
 Affected APIs include 'defface', 'set-face-attribute', their callers,
 and other similar functions.
 
+---
+** 'help-setup-xref' now re-enables the major mode of the Help buffer.
+As a result, in many cases the buffer will be read-only afterwards.
+This should not cause any trouble as long as the actual buffer
+modification takes place inside 'with-help-window' or
+'with-output-to-temp-buffer' after the call to 'help-setup-xref'.
+
+---
+** Xref commands don't automatically suggest to visit a tags table anymore.
+When no tags file is loaded, symbol completion just won't provide any
+suggestions.  So the 'M-?' command now works without a tags table.  And
+the 'M-.' will show a message describing the several built-in options
+that will provide an Xref backend when used.
+
 
 * Lisp Changes in Emacs 31.1
 
@@ -3824,11 +3966,13 @@ and 'dbus-call-method-asynchronously' to allow the user to interactively
 authorize the invoked D-Bus method (for example via polkit).
 
 +++
-*** New D-Bus functions to support systemd inhibitor locks.
-The functions 'dbus-make-inhibitor-lock', 'dbus-close-inhibitor-lock'
-and 'dbus-registered-inhibitor-locks' implement acquiring and releasing
-systemd inhibitor locks.  See the Info node "(dbus) Inhibitor Locks" for
-details.
+*** Support D-Bus file descriptor manipulation.
+A new ':keep-fd' parameter has been added to 'dbus-call-method' and
+'dbus-call-method-asynchronously' to instruct D-Bus to keep a file
+descriptor, which has been returned by a method call, internally.  The
+functions 'dbus--fd-open', 'dbus--fd-close' and 'dbus--registered-fds'
+implement managing these file descriptors.  See the Info node "(dbus)
+File Descriptors" for details.
 
 ** The customization group 'wp' has been removed.
 It has been obsolete since Emacs 26.1.  Use the group 'text' instead.
@@ -3838,6 +3982,14 @@ It has been obsolete since Emacs 26.1.  Use the group 'text' instead.
 If supplied, 'string-pixel-width' will use any face remappings from
 BUFFER when computing the string's width.
 
++++
+** New function 'truncate-string-pixelwise'.
+This function truncates a string to the specified maximum number of
+pixels rather than by characters, as in 'truncate-string-to-width', and
+respects face remappings if BUFFER is specified.  You can also specify
+an optional ellipsis string to append, similar to
+'truncate-string-to-width'.
+
 ---
 ** New macro 'with-work-buffer'.
 This macro is similar to the already existing macro 'with-temp-buffer',
diff --git a/etc/package-autosuggest.eld b/etc/package-autosuggest.eld
new file mode 100644
index 00000000000..257ad853b97
--- /dev/null
+++ b/etc/package-autosuggest.eld
@@ -0,0 +1,205 @@
+;; The contents of this file are loaded into `package--autosuggest-database'.
+;; were automatically generate by scraping ELPA for auto-loaded
+;; code using the `scrape-elpa' command from admin/scrape-elpa.el.  Please do not
+;; update this file manually!
+
+(
+(a68-mode auto-mode-alist "\\.a68\\'")
+(ada-mode auto-mode-alist "\\.ad[abs]\\'")
+(arbitools auto-mode-alist "\\.trf?\\'" arbitools-mode)
+(auctex auto-mode-alist "\\.hva\\'" LaTeX-mode)
+(bnf-mode auto-mode-alist "\\.bnf\\'")
+(chess auto-mode-alist "\\.pgn\\'" chess-pgn-mode)
+(cobol-mode auto-mode-alist "\\.c\\(ob\\|bl\\|py\\)\\'")
+(code-cells auto-mode-alist "\\.ipynb\\'" code-cells-convert-ipynb)
+(csharp-mode auto-mode-alist "\\.cs\\'")
+(csv-mode auto-mode-alist "\\.[Cc][Ss][Vv]\\'")
+(csv-mode auto-mode-alist "\\.tsv\\'" tsv-mode)
+(dicom auto-mode-alist "\\.\\(?:dcm\\|ima\\)\\'" dicom-auto-mode)
+(dicom auto-mode-alist "DICOMDIR" dicom-auto-mode)
+(dismal auto-mode-alist "\\.dis\\'" dismal-mode)
+(djvu auto-mode-alist "\\.djvu\\'" djvu-init-mode)
+(dts-mode auto-mode-alist "\\.dtsi?\\'")
+(ess auto-mode-alist "\\.[Bb][Uu][Gg]\\'" ess-bugs-mode)
+(ess auto-mode-alist "\\.[Bb][Oo][Gg]\\'" ess-bugs-mode)
+(ess auto-mode-alist "\\.[Bb][Mm][Dd]\\'" ess-bugs-mode)
+(ess auto-mode-alist "\\.[Jj][Aa][Gg]\\'" ess-jags-mode)
+(ess auto-mode-alist "/R/.*\\.q\\'" ess-r-mode)
+(ess auto-mode-alist "\\.[rR]\\'" ess-r-mode)
+(ess auto-mode-alist "\\.[rR]profile\\'" ess-r-mode)
+(ess auto-mode-alist "NAMESPACE\\'" ess-r-mode)
+(ess auto-mode-alist "CITATION\\'" ess-r-mode)
+(ess auto-mode-alist "\\.[Rr]out\\'" ess-r-transcript-mode)
+(ess interpreter-mode-alist "Rscript" ess-r-mode)
+(ess interpreter-mode-alist "r" ess-r-mode)
+(ess auto-mode-alist "/Makevars\\(\\.win\\)?\\'" makefile-mode)
+(ess auto-mode-alist "DESCRIPTION\\'" conf-colon-mode)
+(ess auto-mode-alist "\\.Rd\\'" Rd-mode)
+(ess auto-mode-alist "\\.[Ss]t\\'" S-transcript-mode)
+(ess auto-mode-alist "\\.Sout\\'" S-transcript-mode)
+(ess auto-mode-alist "\\.[Ss][Aa][Ss]\\'" SAS-mode)
+(gle-mode auto-mode-alist "\\.gle\\'")
+(gpr-mode auto-mode-alist "\\.gpr\\'")
+(html5-schema auto-mode-alist "\\.html?\\'" nxml-mode)
+(idlwave auto-mode-alist "\\.pro\\'" idlwave-mode)
+(jgraph-mode auto-mode-alist "\\.jgr\\'")
+(json-mode auto-mode-alist "\\.json\\'")
+(lmc auto-mode-alist "\\.elmc\\'" lmc-asm-mode)
+(matlab-mode auto-mode-alist "\\.tlc\\'" tlc-mode)
+(muse auto-mode-alist "\\.muse\\'" muse-mode-choose-mode)
+(auctex auto-mode-alist "\\.drv\\'" latex-mode)
+(auctex auto-mode-alist "\\.dtx\\'" doctex-mode)
+(nftables-mode auto-mode-alist "\\.nft\\(?:ables\\)?\\'")
+(nftables-mode auto-mode-alist "/etc/nftables.conf")
+(nftables-mode interpreter-mode-alist "nft\\(?:ables\\)?")
+(omn-mode auto-mode-alist "\\.pomn\\'")
+(omn-mode auto-mode-alist "\\.omn\\'")
+(poke-mode auto-mode-alist "\\.pk\\'")
+(pspp-mode auto-mode-alist "\\.sps\\'")
+(python auto-mode-alist "\\(?:\\.\\(?:p\\(?:th\\|y[iw]?\\)\\)\\|/\\(?:SCons\\(?:\\(?:crip\\|truc\\)t\\)\\)\\)\\'" python-mode)
+(python interpreter-mode-alist "python[0-9.]*" python-mode)
+(python auto-mode-alist "/\\(?:Pipfile\\|\\.?flake8\\)\\'" conf-mode)
+(rec-mode auto-mode-alist "\\.rec\\'")
+(rnc-mode auto-mode-alist "\\.rnc\\'")
+(sed-mode auto-mode-alist "\\.sed\\'")
+(sed-mode interpreter-mode-alist "sed")
+(shen-mode auto-mode-alist "\\.shen\\'")
+(show-font auto-mode-alist "\\.\\(ttf\\|otf\\)\\'" show-font-mode)
+(sisu-mode auto-mode-alist "\\.ss[imt]\\'")
+(smalltalk-mode auto-mode-alist "\\.st\\'")
+(smalltalk-mode auto-mode-alist "\\.star\\'" archive-mode)
+(sml-mode auto-mode-alist "\\.s\\(ml\\|ig\\)\\'")
+(sml-mode auto-mode-alist "\\.cm\\'" sml-cm-mode)
+(sml-mode auto-mode-alist "\\.grm\\'" sml-yacc-mode)
+(sql-cassandra auto-mode-alist "\\.cql\\'" sql-mode)
+(sxhkdrc-mode auto-mode-alist "sxhkdrc\\'")
+(systemd auto-mode-alist "\\.automount\\'" systemd-automount-mode)
+(systemd auto-mode-alist "\\.mount\\'" systemd-mount-mode)
+(systemd auto-mode-alist "\\.path\\'" systemd-path-mode)
+(systemd auto-mode-alist "\\.service\\'" systemd-service-mode)
+(systemd auto-mode-alist "\\.socket\\'" systemd-socket-mode)
+(systemd auto-mode-alist "\\.swap\\'" systemd-swap-mode)
+(systemd auto-mode-alist "\\.timer\\'" systemd-timer-mode)
+(vcard auto-mode-alist "\\.[Vv][Cc][Ff]\\'" vcard-mode)
+(vcl-mode auto-mode-alist "\\.vcl\\'")
+(wisi auto-mode-alist "\\.parse_table.*\\'" wisitoken-parse_table-mode)
+(wisitoken-grammar-mode auto-mode-alist "\\.wy\\'" simple-indent-mode)
+(wisitoken-grammar-mode auto-mode-alist "\\.wy\\'")
+(adoc-mode auto-mode-alist "\\.a\\(?:scii\\)?doc\\'")
+(apache-mode auto-mode-alist "/\\.htaccess\\'")
+(apache-mode auto-mode-alist "/\\(?:access\\|httpd\\|srm\\)\\.conf\\'")
+(apache-mode auto-mode-alist "/apache2/.+\\.conf\\'")
+(apache-mode auto-mode-alist "/httpd/conf/.+\\.conf\\'")
+(apache-mode auto-mode-alist "/apache2/sites-\\(?:available\\|enabled\\)/")
+(arduino-mode auto-mode-alist "\\.pde\\'")
+(arduino-mode auto-mode-alist "\\.ino\\'")
+(beancount auto-mode-alist "\\.beancount\\'" beancount-mode)
+(bison-mode auto-mode-alist "\\.y\\'")
+(bison-mode auto-mode-alist "\\.l\\'" flex-mode)
+(bison-mode auto-mode-alist "\\.jison\\'" jison-mode)
+(bqn-mode auto-mode-alist "\\.bqn\\'")
+(bqn-mode interpreter-mode-alist "bqn")
+(clojure-mode auto-mode-alist "\\.\\(clj\\|cljd\\|dtm\\|edn\\|lpy\\)\\'")
+(clojure-mode auto-mode-alist "\\.cljc\\'" clojurec-mode)
+(clojure-mode auto-mode-alist "\\.cljs\\'" clojurescript-mode)
+(clojure-mode auto-mode-alist "\\(?:build\\|profile\\)\\.boot\\'")
+(clojure-mode interpreter-mode-alist "bb")
+(clojure-mode interpreter-mode-alist "nbb" clojurescript-mode)
+(coffee-mode auto-mode-alist "\\.coffee\\'")
+(coffee-mode auto-mode-alist "\\.iced\\'")
+(coffee-mode auto-mode-alist "Cakefile\\'")
+(coffee-mode auto-mode-alist "\\.cson\\'")
+(coffee-mode interpreter-mode-alist "coffee")
+(d-mode auto-mode-alist "\\.d[i]?\\'")
+(dart-mode auto-mode-alist "\\.dart\\'")
+(dockerfile-mode auto-mode-alist "[/\\]\\(?:Containerfile\\|Dockerfile\\)\\(?:\\.[^/\\]*\\)?\\'")
+(dockerfile-mode auto-mode-alist "\\.dockerfile\\'")
+(drupal-mode auto-mode-alist "[^/]\\.\\(module\\|test\\|install\\|profile\\|tpl\\.php\\|theme\\|inc\\)\\'" php-mode)
+(drupal-mode auto-mode-alist "[^/]\\.info\\'" conf-windows-mode)
+(drupal-mode auto-mode-alist "[^/]\\.make\\'" drush-make-mode)
+(editorconfig auto-mode-alist "\\.editorconfig\\'" editorconfig-conf-mode)
+(elixir-mode auto-mode-alist "\\.elixir\\'")
+(elixir-mode auto-mode-alist "\\.ex\\'")
+(elixir-mode auto-mode-alist "\\.exs\\'")
+(elixir-mode auto-mode-alist "mix\\.lock")
+(ett auto-mode-alist "\\.ett\\'" ett-mode)
+(forth-mode auto-mode-alist "\\.\\(f\\|fs\\|fth\\|4th\\)\\'")
+(geiser-racket auto-mode-alist "\\.rkt\\'" scheme-mode)
+(gnu-apl-mode auto-mode-alist "\\.apl\\'")
+(gnu-apl-mode interpreter-mode-alist "apl")
+(go-mode auto-mode-alist "\\.go\\'")
+(go-mode auto-mode-alist "go\\.mod\\'" go-dot-mod-mode)
+(go-mode auto-mode-alist "go\\.work\\'" go-dot-work-mode)
+(graphql-mode auto-mode-alist "\\.graphql\\'")
+(graphql-mode auto-mode-alist "\\.gql\\'")
+(haml-mode auto-mode-alist "\\.haml\\'")
+(haskell-mode auto-mode-alist "\\.hcr\\'" ghc-core-mode)
+(haskell-mode auto-mode-alist "\\.dump-simpl\\'" ghc-core-mode)
+(haskell-mode auto-mode-alist "\\.ghci\\'" ghci-script-mode)
+(haskell-mode auto-mode-alist "\\.chs\\'" haskell-c2hs-mode)
+(haskell-mode auto-mode-alist "\\.cabal\\'\\|/cabal\\.project\\|/\\.cabal/config\\'" haskell-cabal-mode)
+(haskell-mode auto-mode-alist "\\.[gh]s\\'")
+(haskell-mode auto-mode-alist "\\.hsig\\'")
+(haskell-mode auto-mode-alist "\\.l[gh]s\\'" haskell-literate-mode)
+(haskell-mode auto-mode-alist "\\.hsc\\'")
+(haskell-mode interpreter-mode-alist "runghc")
+(haskell-mode interpreter-mode-alist "runhaskell")
+(haskell-tng-mode auto-mode-alist "\\.hs\\'")
+(j-mode auto-mode-alist "\\.ij[rsp]$")
+(j-mode auto-mode-alist "\\.ijt$" j-lab-mode)
+(jade-mode auto-mode-alist "\\.jade\\'")
+(jade-mode auto-mode-alist "\\.pug\\'")
+(jade-mode auto-mode-alist "\\.styl\\'" stylus-mode)
+(jinja2-mode auto-mode-alist "\\.jinja2\\'")
+(jinja2-mode auto-mode-alist "\\.j2\\'")
+(julia-mode auto-mode-alist "\\.jl\\'")
+(lua-mode auto-mode-alist "\\.lua\\'")
+(lua-mode interpreter-mode-alist "lua")
+(magit-section auto-mode-alist "/git-rebase-todo\\'" git-rebase-mode)
+(magit auto-mode-alist "/git-rebase-todo\\'" git-rebase-mode)
+(markdown-mode auto-mode-alist "\\.\\(?:md\\|markdown\\|mkd\\|mdown\\|mkdn\\|mdwn\\)\\'")
+(nginx-mode auto-mode-alist "nginx\\.conf\\'")
+(nginx-mode auto-mode-alist "/nginx/.+\\.conf\\'")
+(nix-mode auto-mode-alist "^/nix/store/.+\\.drv\\'" nix-drv-mode)
+(nix-mode auto-mode-alist "\\flake.lock\\'" js-mode)
+(nix-mode auto-mode-alist "\\.nix\\'")
+(php-mode interpreter-mode-alist "php\\(?:-?[34578]\\(?:\\.[0-9]+\\)*\\)?")
+(php-mode auto-mode-alist "/\\.php_cs\\(?:\\.dist\\)?\\'")
+(php-mode auto-mode-alist "\\.\\(?:php\\.inc\\|stub\\)\\'")
+(php-mode auto-mode-alist "\\.\\(?:php[s345]?\\|phtml\\)\\'" php-mode-maybe)
+(proof auto-mode-alist "\\.v\\'" coq-mode)
+(racket-mode auto-mode-alist "\\.rkt\\'")
+(racket-mode auto-mode-alist "\\.rktd\\'")
+(racket-mode auto-mode-alist "\\.rktl\\'")
+(racket-mode interpreter-mode-alist "racket")
+(raku-mode interpreter-mode-alist "perl6\\|raku")
+(raku-mode auto-mode-alist "\\.p[lm]?6\\'")
+(raku-mode auto-mode-alist "\\.nqp\\'")
+(raku-mode auto-mode-alist "\\.raku\\(?:mod\\|test\\)?\\'")
+(rfc-mode auto-mode-alist "/rfc[0-9]+\\.txt\\'")
+(rust-mode auto-mode-alist "\\.rs\\'")
+(sass-mode auto-mode-alist "\\.sass\\'")
+(scad-mode auto-mode-alist "\\.scad\\'")
+(scala-mode auto-mode-alist "\\.\\(scala\\|sbt\\|worksheet\\.sc\\)\\'")
+(stylus-mode auto-mode-alist "\\.jade\\'" jade-mode)
+(stylus-mode auto-mode-alist "\\.pug\\'" jade-mode)
+(stylus-mode auto-mode-alist "\\.styl\\'")
+(subed auto-mode-alist "\\.ass\\'" subed-ass-mode)
+(subed auto-mode-alist "\\.srt\\'" subed-srt-mode)
+(subed auto-mode-alist "\\.vtt\\'" subed-vtt-mode)
+(swift-mode auto-mode-alist "\\.swift\\(interface\\)?\\'")
+(systemd auto-mode-alist "\\.nspawn\\'" systemd-mode)
+(systemd auto-mode-alist "[.0-9@-Z\\_a-z-]+?\\.\\(?:automount\\|busname\\|link\\|mount\\|net\\(?:dev\\|work\\)\\|s\\(?:ervice\\|lice\\|ocket\\|wap\\)\\|t\\(?:arget\\|imer\\)\\)\\'" systemd-mode)
+(systemd auto-mode-alist "\\.#\\(?:[.0-9@-Z\\_a-z-]+?\\.\\(?:automount\\|busname\\|link\\|mount\\|net\\(?:dev\\|work\\)\\|s\\(?:ervice\\|lice\\|ocket\\|wap\\)\\|t\\(?:arget\\|imer\\)\\)\\|override\\.conf\\)[[:xdigit:]]\\{16\\}\\'" systemd-mode)
+(systemd auto-mode-alist "/systemd/[^z-a]+?\\.d/[^/]+?\\.conf\\'" systemd-mode)
+(tuareg auto-mode-alist "\\.ml[ip]?\\'" tuareg-mode)
+(tuareg auto-mode-alist "\\.eliomi?\\'" tuareg-mode)
+(tuareg interpreter-mode-alist "ocamlrun" tuareg-mode)
+(tuareg interpreter-mode-alist "ocaml" tuareg-mode)
+(tuareg auto-mode-alist "\\.mly\\'" tuareg-menhir-mode)
+(tuareg auto-mode-alist "[./]opam_?\\'" tuareg-opam-mode)
+(typescript-mode auto-mode-alist "\\.ts\\'")
+(yaml-mode auto-mode-alist "\\.\\(e?ya?\\|ra\\)ml\\'")
+(yaml-mode magic-mode-alist "^%YAML\\s-+[0-9]+\\.[0-9]+\\(\\s-+#\\|\\s-*$\\)")
+(zig-mode auto-mode-alist "\\.\\(zig\\|zon\\)\\'")
+)
diff --git a/etc/symbol-releases.eld b/etc/symbol-releases.eld
index 3c666423cc0..225e7d86cff 100644
--- a/etc/symbol-releases.eld
+++ b/etc/symbol-releases.eld
@@ -9,6 +9,8 @@
 ;; TYPE being `fun' or `var'.
 
 (
+ ("31.1" fun any)
+ ("31.1" fun all)
  ("30.1" fun dired-click-to-select-mode)
  ("30.1" var dired-click-to-select-mode)
  ("29.1" fun plistp)
diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators
index 2b1444b13b8..bbae2809f2e 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -31,6 +31,7 @@ Maintainer: Rafael Sepúlveda <drs@gnulinux.org.mx>
 * TUTORIAL.el_GR:
 Author:     Protesilaos Stavrou <info@protesilaos.com>
 Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+            Basil L. Contovounesios <basil@contovou.net>
 
 * TUTORIAL.fa:
 Author:     Mohsen BANAN <emacs@mohsen.1.banan.byname.net>