; * lisp/which-key.el (which-key-dont-use-unicode): Add :initialize

This fixes the change from 768e92b9, which accidentally would call
'custom-reevaluate-setting' on user options before they were registered,
initialising their default value to nil.  When the 'defcustom'
expressions were evaluated later on, they were not properly initialised
as their variables were already bound to some value (nil).

https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg00825.html
(cherry picked from commit 6ad6507532bc653c13531112e9a5467e4370929a)

* lisp/touch-screen.el (touch-screen-inhibit-drag): Another typo.

(cherry picked from commit 60b38c317bbd8e6020442a5c0efe504a22eaa092)

Support rescaling sliced images in EWW via 'text-scale-mode'

* src/xdisp.c (find_display_property): When the property value has
multiple elements, return the whole list.

* lisp/net/eww.el (eww--rescale-images): Use 'get-display-property'.

* doc/lispref/display.texi (Display Property): Describe the new
'get-display-property' behavior (bug#71741).

(cherry picked from commit 6837828219b965148219f6d8eba4c740aaddacbb)

Fix rescaling of images via 'text-scale-mode' in EWW

* lisp/net/eww.el (eww--rescale-images): Handle a :scale of 'default'
(bug#71741).

(cherry picked from commit 3abcfe013d809a8194f5158877fd43f11d714fd5)

* lisp/touch-screen.el (touch-screen-inhibit-drag): Fix typo.

(cherry picked from commit 0e43606b20d4ce1c094dfc41ee90f46517aa7419)

Fix latent side-effects of respecting field boundaries in text conversion

* src/textconv.c (textconv_query, get_extracted_text)
(get_surrounding_text): Restore selected window in addition to
excursion.
(locate_and_save_position_in_field): Restore excursion lest the
current buffer differ from the selected window's contents, to
prevent redisplay from clobbering the current buffer when called
while the current buffer is at variance with the selected
window's contents, as seen with dired-other-window.

(cherry picked from commit 1b4c56272110944c4ea1483c6f9662de9e42a07b)

; * lisp/treesit.el (treesit--syntax-propertize-start): Fix doc.

(cherry picked from commit 2ba39a30bf4fbe90b5b5e16a50dc7090a42b759b)

; * lisp/simple.el (undo-auto--boundaries): Doc fix (bug#71755).

(cherry picked from commit e4046f33ab8ff2a5a1edbba2634d52bcadf25b24)

; * lisp/language/cyrillic.el: Delete obsolete commentary (bug#71754).

(cherry picked from commit 008eeb21fdb294726a4d151929d3fff26658c8a8)

Add missing builtin package declarations

* lisp/editorconfig-conf-mode.el:
* lisp/editorconfig-core-handle.el:
* lisp/editorconfig-core.el:
* lisp/editorconfig-fnmatch.el:
* lisp/editorconfig-tools.el: Declare library as part of the
'editorconfig' package.

(cherry picked from commit 680155d3f0328a22ecce18647779e0e26931e825)

Extend treesitter tests on emba

* test/infra/Dockerfile.emba (emacs-tree-sitter): Install c-ashrp
grammar.

* test/infra/Makefile.in (TREE-SITTER-FILES): Add csharp-mode-tests.el.
(tree-sitter-files): Rename from tree-sitter-files-template.
Generate .tree-sitter-files.

* test/infra/gitlab-ci.yml (test-tree-sitter): Extend .tree-sitter-files.

* test/infra/test-jobs.yml: Regenerate.

(cherry picked from commit ce4f56caf71b24ef005c832168f92bc72b532460)

Show entries from key-translation-map in which-key mode

* lisp/which-key.el (which-key-extra-keymaps): New user option.
(which-key--get-current-bindings): Consult it.

(Bug#71648)

(cherry picked from commit 7e8a97ac7885c1f0818a713e98bedd558293bb39)

* lisp/tab-bar.el (tab-bar-tab-group-face-function): Improve doc (bug#71733).

(cherry picked from commit 4a0958642d96fcd521087dc4fa54d0701797a585)

; Fix flymake tests with GCC 14.

* test/lisp/progmodes/flymake-tests.el (included-c-header-files):
Fix test failure with GCC 14.  (Bug#71749)

(cherry picked from commit a769f171e7ebb8e30f198f4328d46f47fe7958fb)

Don't show char name for multi-char translations

I forgot about shift-translation when implementing this originally, so
this code was being triggered for things like 'C-S-<up>'.

* lisp/help.el (help-key-description): Check if the translation result
is a single char.

(Bug#71411)

(cherry picked from commit 96e27c2ecf9914cbb9d2e0824adf501082f88ef6)

Reset ls-lisp-use-string-collate when ls-lisp-emulation changes

* lisp/ls-lisp.el (ls-lisp-set-options): Add ls-lisp-use-string-collate
to the list of custom options that are reset when ls-lisp-emulation
changes.

https://lists.gnu.org/archive/html/help-gnu-emacs/2024-06/msg00135.html
(cherry picked from commit 0715abfa86acb1289074ac7647984941c71759ec)

Update to Transient v0.7.2-1-gf273c0c8

This fixes two bugs, one of them restoring compatibility with the
version that ships with Emacs 29, making emoji-insert usable again.
The other changes are of cosmetic nature.  The only exception is a new
command, whose creation lead to the discovery of one of the bugs, and
remains unused until a package author actually binds it in a prefix.
I.e., unless someone actually uses this, the risk of a regression is
close to zero, and even if it is used, it can only affect the prefix
that binds it.

(cherry picked from commit 4fcc38966bf58cc9977fc9fea0f7cec7eea30f6b)

; Fix typos

* ChangeLog.3: It's "its", not "it's", for the possessive.
* ChangeLog.4: And here.

(cherry picked from commit 164f75822b2055606d8f36453dc9a874296983ec)

Update options that depend on 'which-key-dont-use-unicode'

* lisp/which-key.el (which-key-dont-use-unicode): Add a custom setter
that re-evaluates a manual list of options use
'which-key-dont-use-unicode' to determine their default value.

https://lists.gnu.org/archive/html/help-gnu-emacs/2024-06/msg00130.html
(cherry picked from commit 768e92b9c0214a2aa1be2afbee48c455583d3110)

(xref-show-definitions-completing-read): Add 'minibuffer-action'

; completion-preview-tests.el: Deduplicate some test code

* test/lisp/completion-preview-tests.el
(completion-preview-tests--insert-and-preview): New function.
(completion-preview)
(completion-preview-multiple-matches)
(completion-preview-exact-match-only)
(completion-preview-function-capfs)
(completion-preview-non-exclusive-capfs)
(completion-preview-face-updates)
(completion-preview-capf-errors)
(completion-preview-complete)
(completion-preview-insert-calls-exit-function): Use it.

windmove.el: Remove bespoke key binding machinery

* doc/misc/calc.texi (Musical Notes): Fix typo.

(cherry picked from commit e4e1d0cd0747f8326fbe55a7486edd51e2e6d21d)

Fix omission of updates to child frames on Android

* java/org/gnu/emacs/EmacsView.java (onAttachedFromWindow):
Force a layout cycle rather than report exposure immediately.
(prepareForLayout): Delete function.

* java/org/gnu/emacs/EmacsWindow.java (mapWindow): Remove
redundant calls to prepareForLayout.

* src/androidterm.c (handle_one_android_event): Do not swap
buffers when exposure is registered by a frame only partially
updated.

(cherry picked from commit 73a58329a6946f5abc62fee2647efba56cce236b)

Add jsdoc support to js-ts-mode

* lisp/progmodes/js.el (js--treesit-font-lock-settings): Add jsdoc
font-lock settings.
(js--treesit-jsdoc-beginning-regexp): New variable to match the
beginning of a jsdoc block.
(js-ts-mode): Add jsdoc support. Save the 'javascript parser to
`treesit-primary-parser'. Configure `treesit-range-settings' to
use a jsdoc parser within a JavaScript file.
(js-ts-language-at-point): New function to return either 'jsdoc or
'javascript depending on where the point is.

(cherry picked from commit 0edacf2aa7e53d0cec95bcaae4cd19e5389b70f8)

; Restore inadvertently removed line.

(cherry picked from commit cace0cbee93f2a7f70a14a8445abcd176d3b3af2)

; * test/lisp/net/shr-tests.el (shr-test--rendering-check): Use UTF-8.

(cherry picked from commit 2b04effb13d2082358aed3a789cddc124dd7c4f2)

; Don't run new 'shr-test/zoom-image' when built without image support

* test/lisp/net/shr-tests.el (shr-test/zoom-image): Skip when
'image-types' is unbound.

(cherry picked from commit 6619aec6bca6d682be9a995f417e65bb0849d593)

; * admin/release-branch.txt: Update and fix typo.

(cherry picked from commit 5d19bfda3219c9d2d2a94656d842a9019b274b51)

Ignore all dot-files in .gitignore

* .gitignore: Ignore all dot-files except for those checked into Git.
This makes us less opinionated about using tools in the Emacs tree.

(cherry picked from commit 9688fd6eb1d05e97c556cd53c53dd92220d9efaa)

Delete obsolete file process.cocci

* admin/coccinelle/process.cocci: Delete file.  This semantic patch was
converting code to use the PVAR macro, which was removed by Paul Eggert
on 2012-08-17 (commit 6a09a33b5551).

(cherry picked from commit 7bedbbc708aa3d369617881020807387e7c5b6b1)

; Fix typos

(cherry picked from commit fb11294d4156a4be45080ff286a8ee0d5a3ede9b)

Allow git 1.8.2 features in .gitignore

* .gitignore: Assume git 1.8.2 or later; we already use the '**' feature
from that version since 2021.

(cherry picked from commit 93088fc13c47fbab875f9ee173c0a66d623d91c6)

Prefer setq-local in reftex

* lisp/textmodes/reftex-global.el (reftex-find-duplicate-labels)
(reftex-isearch-minor-mode):
* lisp/textmodes/reftex-index.el (reftex-index-mode)
(reftex-display-index, reftex-index-initialize-phrases-buffer)
(reftex-index-phrases-mode):
* lisp/textmodes/reftex-sel.el (reftex-select-label-mode)
(reftex-select-bib-mode, reftex-insert-docstruct, reftex-select-item):
* lisp/textmodes/reftex-toc.el (reftex-toc-mode, reftex-toc):
* lisp/textmodes/reftex.el (reftex-fontify-select-label-buffer):
Prefer setq-local.

(cherry picked from commit b9ce39ba809f49fe80d5b9a6d41afe1fe144fc77)

* src/puresize.h (BASE_PURESIZE): Increase.

(cherry picked from commit 39aa286072924ebef68b068fa9d9afc8374ede86)

Update emacs-module for Emacs 31

* src/module-env-31.h: New file.
* src/module-env-30.h:
* configure.ac:
* src/emacs-module.h.in: Update emacs-module files for Emacs 31.

(cherry picked from commit 2d6ca28ce71ab81fb79d702f06b6ad47aa5de433)

* lisp/cus-edit.el (customize-changed-options-previous-release): Bump version.

(cherry picked from commit c246de0d163354daeac58d13db320b4157166340)

Bump Emacs version to 31.0.50

* README:
* configure.ac:
* nt/README.W32:
* msdos/sed2v2.inp:
* etc/refcards/ru-refcard.tex:
* etc/NEWS: Bump Emacs version to 31.0.50.
* etc/NEWS.30: New file.

(cherry picked from commit 17f202939e9d28e207acfb95a5e93563efc0a834)

; Move etc/NEWS to etc/NEWS.30

(cherry picked from commit 23e08245c3f807f0da4f9b92eee9bb897533c088)

New branch emacs-30

* README:
* configure.ac:
* nt/README.W32:
* etc/refcards/ru-refcard.tex:
* msdos/sed2v2.inp:
* lisp/cus-edit.el (customize-changed-options-previous-release):
Cut the emacs-30 release branch.

(cherry picked from commit dd0fc6aff602447d3e62d52a2a3b45b1a5733f28)

* admin/admin.el: (set-version): Fix regexp for configure.ac.

(cherry picked from commit bc72c33ac387a0a8cee5a9c0796db35c1c675297)

Disable Ffile_system_info for Android special directories

* src/fileio.c (Ffile_system_info): Return Qnil if FILENAME
refers to a special directory.

(cherry picked from commit 60475a73d17d293f5c1e82bc5b3c058b414266e8)

Fix a bug in 'switch-to-buffer'

* lisp/window.el (switch-to-buffer): When asked to switch to the
buffer of the selected window,
'switch-to-buffer-obey-display-actions' is non-nil and
'pop-to-buffer' uses the selected window, don't try to restore
window start and point from 'window-prev-buffers' (Bug#71616).

(cherry picked from commit 5f8a9cd4b6f4441c158a750ad7c5b937b559edd4)

Fix zooming images in SHR

Previously, for images with no alt-text, the zoomed image wouldn't get
properly inserted.  For images with alt-text, both the zoomed and
unzoomed image would be displayed at once (bug#71666).

* lisp/net/shr.el (shr-sliced-image): New face.
(shr-zoom-image): Reimplement using
'next/previous-single-property-change', and don't bother deleting any of
the text.
(shr-image-fetched): Clean up any overlays when deleting the old region.
(shr-put-image): Ensure we always have a non-empty string to put the
image on.  For sliced images, just use "*", since we'll repeat it, so we
can't preserve the original buffer text exactly anyway.  Apply an
overlay to sliced images to prevent unsightly text decorations.
(shr-tag-img): Move the placeholder space insertion where it should be
and explain what it's doing.

* test/lisp/net/shr-tests.el (shr-test--max-wait-time)
(shr-test-wait-for): New helper functions.
(shr-test/zoom-image): New test.

(cherry picked from commit 5f9b5803bea0f360a91e00cd85d72ea7f56d6095)

; Doc fix in 'php-ts-mode'.

* lisp/progmodes/php-ts-mode.el (php-ts-mode-css-fontify-colors):
Doc fix.

(cherry picked from commit 6f2036243f24369b0b4c35c9b323eb19dad4e4cd)

Colorize CSS property value like `css--fontify-region'

If the value of a property is text representing a CSS color,
it will be fontified such that its background is the color
itself. 'php-ts-mode-css-fontify-colors' can be used to
disable this behaviour.
* lisp/progmodes/php-ts-mode.el (php-ts-mode-css-fontify-colors):
New custom var.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--colorize-css-value):
New function.
* lisp/progmodes/php-ts-mode.el (php-ts-mode): Use the new
function.  (Bug#71724)

(cherry picked from commit 2f1c882a16e5e5215da039af1b4c4a8f569db1a1)

* configure.ac: Disable kqueue on Haiku.

(cherry picked from commit 486ea8ef5ac6c01fb017475708b03aefe525a626)

Fix 'Customize' menu entry for 'php-ts-mode'

* lisp/progmodes/php-ts-mode.el (php-ts-mode-menu):
Replace menu entry with 'php-ts-mode' group.  (Bug#71723)

(cherry picked from commit 737fa7c52925cfa578f49f277e0bdfa4e2f9fb4c)

Fix compilation on prerelease versions of Haiku

* src/kqueue.c (Fkqueue_add_watch): Don't specify EV_ENABLE
unless it is defined.

(cherry picked from commit cb7be6035eeb7165d6789bb62708a14607e84e5d)

Fix FIXME in comment

* src/timefns.c (decode_float_time): Explain why the code
can use large precision here, removing a FIXME by updating
the containing comment.

(cherry picked from commit 2b848a4e504319cce150000a2c3855f66d89714b)

Update SKK-JISYO.L from upstream

* leim/SKK-DIC/SKK-JISYO.L: Update from
https://raw.githubusercontent.com/skk-dev/dict/master/SKK-JISYO.L

(cherry picked from commit 77e3a56507d0f06662d1be692194a4e40f6ffc68)

Update publicsuffix.txt from upstream

* etc/publicsuffix.txt: Update from
https://publicsuffix.org/list/public_suffix_list.dat
dated 2024-06-21 13:05:36 UTC.

(cherry picked from commit e5bae788614cdf9367e245f55125d6b53b795197)

Add assignment form as `etc/copyright-assign.txt`

This change was discussed in:
https://lists.gnu.org/r/emacs-devel/2023-12/msg00326.html

* etc/copyright-assign.txt: New file copied from
https://www.gnu.org/s/gnulib/Copyright/request-assign.future
* doc/emacs/trouble.texi (Copyright Assignment):
* etc/TODO: Point to above new file.

(cherry picked from commit bf5f74288b7b143b38c0f65b45004130a856d99d)

; Skip commit 0f01cb0ebd12c361b3f7bd7a44159911f52301bf

Minor changes in tramp-tests.el

* test/lisp/net/tramp-tests.el (tramp--test-shell-file-name):
Use connection-local value.
(tramp--test-shell-command-switch): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name): Use it.
(tramp--test-supports-processes-p): Simplify.
(tramp--test-check-files): Use `tramp-compat-seq-keep'.
(tramp-test45-asynchronous-requests): Don't let-bind `shell-file-name'.
(tramp-test45-asynchronous-requests): Adjust timer.
(tramp-test45-asynchronous-requests): Add another test message.

(cherry picked from commit c95caade15d295fa6cc31d337028faa15142b388)

Tramp: Fix bug#71709, and other minor changes

* lisp/net/tramp-message.el (tramp-backtrace): Print also in batch mode.

* lisp/net/tramp.el (tramp-skeleton-file-exists-p): Check for
property only.
(tramp-skeleton-make-process): Don't set `default-directory'.
(tramp-handle-make-process): Set it.  (Bug#71709)

(cherry picked from commit 8456cb9b698dfbfc90af82b3ebcd739fc22be4e4)

; Remove debugging code in Completion Preview test

* test/lisp/completion-preview-tests.el
(completion-preview-complete): Remove leftover debug message.

; Update ldefs-boot.el

Fix for grammar change of keyword "virtual" in tree-sitter-cpp

The new rule works with both the new (>= 0.22.1) and the
old (<= 0.22.0) grammar libraries.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--keywords): Removed
the keyword "virtual".
* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
New font lock rule. (Bug#71518)

(cherry picked from commit 014aab9847a0d3d898cb8cbc7224143f2d741abb)

; Skip commit fa364a0d469adcadb77808271b654d5d51953494

; Skip commit a81417e576682c09e1671a8327c9586e14bf94fe

; Skip commit ff389163ee8d2b3af3b92dabc3d58a9c9ed3b94f

; Skip commit ea057131220bba504d28812dc8be58007017b029

Replace literal whitespace with `\s`

* test/lisp/vc/log-edit-tests.el (log-edit-fill-entry-confinement)
(log-edit-fill-entry-space-substitution)
(log-edit-fill-entry-initial-wrapping): Replace literal space character
with '\s', to avoid tripping up merge scripts.

(cherry picked from commit 4a76af51bb685e3082b152c35117bab1ed511d40)

; * lisp/editorconfig.el (editorconfig-indentation-alist): Fix :type.

(cherry picked from commit 8520ec829d30195373aea2ae8bd7bdcf01f80b41)

Fix non-existing `editorconfig-set-indentation-python-mode`

* lisp/editorconfig.el (editorconfig--get-indentation-python-mode):
New function.
(editorconfig-indentation-alist): Use it.
(editorconfig-indent-size-vars): Improve docstring.
(editorconfig--default-indent-size-function): Add docstring.

(cherry picked from commit 99161fb7140ea67b606e8e8d3129ab6dbc0813a3)

; Skip commit 6a299b3caceb2c73b932ba73849738faa8c5d975

; Skip commit 7cc939bf27eee14eaad6945294f76cb097ecf056

; Skip commit 959eacc2a705caf067442a96ac17dcb8616f6d96

; Skip commit 9a02fce714c546710b592db971f3cf0d123a2a44

; Skip commit d96c54d388373d35a974ae37210707a105f65207

; Skip commit fd207432e50264fc128e77bad8c61c0d0c8c0009

org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code

* lisp/org/ol.el (org-link-expand-abbrev): Refuse expanding %(...)
link abbrevs that specify unsafe function.  Instead, display a
warning, and do not expand the abbrev.  Clear all the text properties
from the returned link, to avoid any potential vulnerabilities caused
by properties that may contain arbitrary Elisp.

(cherry picked from commit c645e1d8205f0f0663ec4a2d27575b238c646c7c)

; Skip commit 50a237c4689b0531e82d5f731ae7c825f3d43310

Remove some long obsolete libraries

; (dbus-test07-introspection): Skip in CI

Add before-save-hook to man page files

* doc/man/ebrowse.1:
* doc/man/emacs.1.in:
* doc/man/emacsclient.1:
* doc/man/etags.1: Add 'before-save-hook' that runs 'time-stamp' to
local variables.

(cherry picked from commit 3f3c08bcc7693c309f42bf6a2445bbfd733808a8)

Use UTC when generating man page timestamps

* doc/man/ebrowse.1:
* doc/man/emacs.1.in:
* doc/man/emacsclient.1:
* doc/man/etags.1: Add 'time-stamp-time-zone' to local variables to
prefer UTC when generating timestamp.

(cherry picked from commit 7b0e6cb3ffa01eeffde347a1dee93bfc8d60850e)

; * src/xfns.c (unwind_create_frame): Add missing definition.

(cherry picked from commit 150e2b979c1f5c9fac4726b7775217d5b0330954)

Allow to expand truncated long lines in *Compilation* buffers

* lisp/progmodes/compile.el (compilation-button-map): Bind keys
in 'compilation-button-map' to allow expanding the truncated
text.  (Bug#71683)

(cherry picked from commit 75fdeef7b494b0acffb69822ff9bec148140de16)

Eglot: Fix command execution (bug#71642)

* lisp/progmodes/eglot.el (eglot--lsp-interface-alist): Add
ExecuteCommandParams interface.
(eglot--execute): Fix handling of Command and CodeAction and add
ExecuteCommandParams.

Copyright-paperwork-exempt: yes
(cherry picked from commit fb1b188e1ada59848b82c961e32212f6340bad28)

Support for indentation of PHP alternative syntax control structures

For some control structures, PHP provides an alternative syntax.
A new rule has been added to handle this syntax.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--indent-styles):
New rule for PHP alternative syntax.  (Bug#71710)

(cherry picked from commit 155cc89de0266e28b68fdecfdc2a0a40b9d79001)

; Wayland SECONDARY selection problem

* etc/PROBLEMS: Document problems with SECONDARY selection on
Wayland.  (Bug#71656)

(cherry picked from commit 7f7b28a2500235452ad636d0cc035d378ac05ec3)

Prevent auto-revert when deleting entry (bug#71264)

* lisp/dired.el (require): Require "autorevert" for
`auto-revert-mode' usage.
(dired-internal-do-deletions): Temporarily prevent auto-revert.

(cherry picked from commit 11fb3510f48f3eeeca0bf5622c028c5138ba50f3)

Fix font lock regex for user defined constant in PHP

The old regex also captured functions with two or more
uppercase characters.  This new regex fixes that issue.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--font-lock-settings):
New regex that match only user-defined constants.  (Bug#71593)

(cherry picked from commit a4fe4ca93cfdc835ecd8c5dcc98c201a1eefb546)

Make Compilation mode recognize non-legacy Kotlin/Gradle errors

The Compilation mode recognizes Kotlin/Gradle errors but only in
the now legacy format.  The current format, which has been in wide
use for about a year, is not supported.  This change adds support
for the current format.
* etc/compilation.txt: (symbols): Add examples of non-legacy
Kotlin/Gradle warnings and errors.
* lisp/progmodes/compile.el: (compilation-error-regexp-alist-alist):
Rename 'gradle-kotlin' to 'gradle-kotlin-legacy' and add
'grade-kotlin' that matches the errors and warnings outputted by
the current (non-legacy) Kotlin/Gradle.  (Bug#70797)
* test/lisp/progmodes/compile-tests.el
(compile-tests--test-regexps-data): Rename 'gradle-kotlin' to
'gradle-kotlin-legacy' and add two test cases for the newly added,
non-legacy Kotlin/Gradle warnings and errors.

(cherry picked from commit e1ba4ebb495199d1723bd9c4a1f687a02207ee23)

; Improve documentation of EditorConfig support

* doc/emacs/custom.texi (EditorConfig support): Improve wording
and indexing.
* doc/emacs/emacs.texi (Top): Update @detailmenu.

(cherry picked from commit 4f030834994ce06822779fe0f2c316a941ee6ea8)

* admin/emacs-shell-lib: Backport to Bash 4.4 or older.

(cherry picked from commit f3e80dd0f70aabb6abcddb0148f75356fb60c32b)

Fix bug#49289 also for other auth-source backends

* lisp/auth-source.el (auth-info-password): Revert commit 59261e6f4fe.
(auth-source-secrets-create, auth-source-plstore-create):
Search also for :user.  (Bug#49289)

(cherry picked from commit ce85d3811daea42db78fc1c5bc4a7375ac5e209d)

* doc/emacs/custom.texi (Directory Variables): Add menu

(cherry picked from commit 60070d0d749ecd711949683108305fe50bf39d1a)

(describe-mode-local-bindings[-in-mode]): Add 'minibuffer-action'

(em-cmpl-test/file-completion/non-unique): Fix test

Restore mode-local.el

It was removed as part of CEDET.

; Auto-commit of loaddefs files.

Remove stale reference in 'update_autogen'

Fix `emacs --geometry` flag on macOS

* lisp/startup.el (command-line-ns-option-alist): Fix --geometry
flag on macOS.  (Bug#71669)

(cherry picked from commit 31e3d5fe9b9ba822bcc86d444298e7cafac01d3c)

; eliminate backslash duplicate in regexp

* lisp/editorconfig-fnmatch.el (editorconfig-fnmatch--do-translate):
Remove superfluous backslash.

(cherry picked from commit 052d2cd2582dbdd3bb4d4e68d5f4dce588ed06e2)

* doc/emacs/custom.texi (EditorConfig support): Add URL

(cherry picked from commit 5bc76dbc9d19b8a9f7d6fcfafb197fe398c022bd)

; * src/keyboard.c (read_char): Typo in comment.

(cherry picked from commit e7123edfe7f7abc9043429dfb3f84941f83d6565)

Fix execution of tool-bar commands read within minibuffer-error-handler

* src/keyboard.c (read_char): Arrange that the original event be
recorded when a posn is promoted to a prefix key and an END_TIME
is suppressing additions to this_command_keys.

(cherry picked from commit 0ade6348f92283e4fd0bc209f100d8fe1bb87d2a)