; Skip commit 048e72a403e22dc394b265c6ff290b8d40e806a5

Prefer defvar-keymap in python.el

It's okay to use defvar-keymap here since the 'compat' package backports
it for all versions of Emacs that we support (24.4 or later).

* lisp/progmodes/python.el (python-mode-map): Prefer defvar-keymap.
(python-menu): Move to toplevel.

(cherry picked from commit 364801fcd66d8e93a900fd750a998f4590d85397)

; Minor cleanup of python-interpreter variable

* lisp/progmodes/python.el (python-interpreter)
(python-shell-interpreter): Simplify definition.

(cherry picked from commit 84c66625e5ef268ec958a04eb61ba8f2beb2ea02)

; Tweak line breaks in last change

(cherry picked from commit 50e522123618011b742985fda941ed17e339a9aa)

icomplete-completions: Revise computation of prospects-len

* lisp/icomplete.el (icomplete-completions): Revise computation of
prospects-len (i) to avoid calling string-width on the entire
buffer-string, which could be slow; and (ii) to better handle minibuffer
prompts with embedded newlines (bug#72826).

(cherry picked from commit a96954b982ddd441ac943bfa48015fb4775c00cb)

; Skip commit 9f54f24e94d039331b982012bd66e960cfc764ff

work-buffer--release: Bind inhibit-read-only

* lisp/emacs-lisp/subr-x.el (work-buffer--release): Bind
inhibit-read-only while erasing the buffer.

(cherry picked from commit 069ecc9c4c3709246a6ff50d09af418444d427c3)

Update Arni Magnusson's email address

* .mailmap:
* doc/lispref/ChangeLog.1:
* doc/misc/ChangeLog.1:
* lisp/ChangeLog.16:
* lisp/ChangeLog.17:
* lisp/progmodes/bat-mode.el: Update email address of
Arni Magnusson.  (Bug#73631)

(cherry picked from commit 5a462948e13393fc742e36b655c529f3c5e851bb)

Fix python-ts-mode-map docstring

* lisp/progmodes/python.el (python-ts-mode-map): Fix docstring.

(cherry picked from commit 6b1271b169a8c5d46eace65fb9348d6110527cf3)

Use python-mode for SCons build files

SCons is a build system whose associated files are Python scripts.
Ref: https://www.scons.org/doc/0.96/HTML/scons-user/x325.html

* lisp/progmodes/python.el (python--auto-mode-alist-regexp):
Use 'python-mode' for SCons build files.

(cherry picked from commit 6e8fc4f6eabe21fc3e6df8c860a99e3e5f3748fd)

Normalize "Commentary" section in eudc.el

* lisp/net/eudc.el: Normalize "Commentary" section to make
'M-x describe-package RET eudc RET' more useful.

(cherry picked from commit aaaafddc945bbd046d675ea50f221edb02c8988b)

Also use "Python Module Index" for info lookup

* lisp/info-look.el (:mode): Also search Python module index.

(cherry picked from commit e2b8e9d940d1bddff9c1d201f8ca6ea85f2af104)

Future-proof searching for Python info manual

* lisp/info-look.el (:mode): Python is released annually (PEP 602), so
search for minor version based on the current year.

(cherry picked from commit 0cca6146dc8dc2dff648dfeb7b68b56c423d90ec)

; * etc/NEWS: Document Python electric-layout-mode support.

(cherry picked from commit 776ca54e8debe035786a14a560eac27df8d1643c)

python: Better support := in electric-layout-mode

* lisp/progmodes/python.el (python-base-mode): Use heuristic to better
support the Python walrus operator := in electric-layout-rules.

(cherry picked from commit ee6e737fdf7a1bea3abec383a1bf0ae69ac8ca77)

* lisp/info-look.el (:mode): Support IELM.

(cherry picked from commit e9727982cf62d0848056a9f3e42e8e719a609c8d)

Shorten info-lookup-mode docstring

* lisp/info-look.el (info-lookup-mode): Shorten variable docstring by
removing information that is auto-generated by 'describe-variable'.

(cherry picked from commit ecac8ca62ea1dab8cf353ff4274469840ce3d0c9)

Expose lambdas in info-look.el to byte-compiler

* lisp/info-look.el (:mode): Expose lambdas to byte-compiler.

(cherry picked from commit 9ba20e8f39ca4784c6445b92603eca7a045954ac)

Expand email abbrevs in X-Debbugs-Cc header.

* lisp/mail/mailabbrev.el (mail-abbrev-mode-regexp):
* lisp/mail/mailalias.el (mail-address-field-regexp)
(mail-complete-alist): Add "X-Debbugs-Cc" to headers where email
aliases should be expanded, for compatibility with emacsbug.el.

(cherry picked from commit d656be9794dcce02fb0b2ac3f5a955ddbe57040d)

; Skip commit 1094c3f91477e622e064fa52de7fd0f361e54d9b

Fix 'list-tags' when invoked from a non-file buffer

This use case was broken by the improvement that attempts to
offer the current buffer's file name as the default file whose
tags to list.
* lisp/progmodes/etags.el
(tags--get-current-buffer-name-in-tags-file): Doc fix.  Return nil
if no file is associated with the current buffer, and avoid
signaling an error if 'buffer-file-name' returns nil.  (Bug#37611)
(list-tags): Doc fix.  Signal an error if the user specifies no
file name at the prompt.

* doc/emacs/maintaining.texi (List Identifiers): Fix wording of
the documentation of 'list-tags'.

(cherry picked from commit e9dcf0c57ddea6a3ac3136e82cdb740326e735d4)

* lisp/net/sieve-mode.el (sieve-tagged-arguments): Face name typo.

(cherry picked from commit ea7be865ac09d41844d04e5576dcd10a1d7d7d54)

count-windows: Fix reference to walk-windows

* lisp/window.el (count-windows): Refer to walk-windows for the
precise meaning of both the MINIBUF and ALL-FRAMES arguments,
not just the ALL-FRAMES argument.  In both functions, these
arguments are both passed through to window-list-1.

(cherry picked from commit 51ef05f684c779b492965571cf9a169b93e86aa0)

* lisp/info-look.el (mapc): Add use-package manual's index.

(cherry picked from commit 5eaf0c784bf1709d3ad18ff4a0b4d4b7ec03cf91)

; Skip commit 705a5a1a9e6c3ae006a2aa4d6bc9d02951a58aa6

Update csharp-ts-mode font-lock (bug#73369)

Adapt to the latest c-sharp grammar.

* lisp/progmodes/csharp-mode.el:
(csharp-ts-mode--test-this-expression):
(csharp-ts-mode--test-interpolated-string-text):
(csharp-ts-mode--test-type-constraint):
(csharp-ts-mode--test-type-of-expression):
(csharp-ts-mode--test-name-equals):
(csharp-ts-mode--test-if-directive):
(csharp-ts-mode--test-method-declaration-type-field): New
functions.
(csharp-ts-mode--type-field): New variable.
(csharp-ts-mode--font-lock-settings): Fix font-lock rules.

(cherry picked from commit bf26ff0dc8d1591c9c75e12cfdf057353b3869bf)

; * doc/lispref/variables.texi (Creating Buffer-Local): Fix wording.

(cherry picked from commit 4c866abab966e85ed1fb57aea9971ce8d1495970)

; * lisp/doc-view.el (doc-view-svg-face): Copy-edit docstring.

(cherry picked from commit d42d7d474fe07a577d9f8006323784583867ec43)

; * admin/MAINTAINERS: Take VC subsystem, add note about handovers

Based on discussion with the head maintainers and Dmitry by private mail.

(cherry picked from commit f46f476bb8f1b0f4f63c2af86aa0dcd11c9e2c7c)

; rcirc-update-activity-string: Justify some existing behaviour

(cherry picked from commit d68e6d2689d0b3be4d251b0edc09fba144f7b282)

Fix inconsistency in value of rcirc-activity-string

* lisp/net/rcirc.el (rcirc-update-activity-string): Consistently
don't display anything if there aren't any IRC connections.

(cherry picked from commit e6a37869c8dcbd17b01dab66c5588f087a33ddf0)

Revert "; Minor clarification in variables.texi"

This reverts commit 44156c2140772fa04ebbc0a488a85f0741e0c2ef.

(cherry picked from commit 108b3179bd4bcc82791ea5998de5dadb647992c4)

; Minor clarification in variables.texi

* doc/lispref/variables.texi (Creating Buffer-Local): Add comma to make
reference clearer.

(cherry picked from commit 44156c2140772fa04ebbc0a488a85f0741e0c2ef)

Tag interactive commands in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-send-buffer)
(lua-ts-send-file, lua-ts-send-region): Mark inferior interaction
commands that are only relevant in Lua buffers.  (Bug#73586)

(cherry picked from commit 63058e1153ae1c3a9662b50ff8be439026e11986)

; * lisp/info-look.el: Add two more links.

(cherry picked from commit 84bea20eba2fd7c9b8c81b816fffe69a2b7892e3)

Mention LSP acronym in eglot defgroup docstring

* lisp/progmodes/eglot.el (eglot): Improve defgroup description by
mentioning the LSP acronym, for users that might be searching for that.

(cherry picked from commit 96b87ad5363feed7a3bc5ab1c7fa096867140cf4)

Change :group of 'eglot' defgroup to 'tools'

In 'M-x customize', Eglot fits in better in "Programming -> Tools", with
the likes of Flymake and Gud, than it does in "Applications", with ERC
and Newsticker.

* lisp/progmodes/eglot.el (eglot): Change :group of defgroup to 'tools'.

(cherry picked from commit 9c904e8ceae935a370a20f8255a355997786647c)

Remove out-of-date documentation from python.el

* lisp/progmodes/python.el: Remove out-of-date documentation about
automatic indentation; 'electric-indent-mode' is enabled by default in
Emacs 24.4 or later, so this is no longer an issue.

(cherry picked from commit fd1a1b07805a0d84ca3a7fe83a5f90a8fa0fd00b)

Fix executing commands in Eshell using "env" with no local variables

* lisp/eshell/esh-var.el (eshell/env): Throw 'eshell-replace-command' as
needed.

* test/lisp/eshell/esh-var-tests.el
(esh-var-test/local-variables/env/no-locals): New test (bug#73479).

(cherry picked from commit 11e3e0cadd46ee49007477af1335ddd5365debe2)

Fix a typo in the calendar manual

* doc/emacs/calendar.texi (Calendar Unit Motion): Add a missing
parenthesis.  (Bug#73555)

(cherry picked from commit c0ef8a9a1b39c63de17b375485cc405f994d4e55)

; Fix a thinko in sieve-manage.el

* lisp/net/sieve-manage.el (sieve-manage--append-to-log): Fix
thinko.  (Bug#54154)

(cherry picked from commit 36ff7138febfcec7fcee44e8b51c6b26cbb056a2)

; * nt/INSTALL: Update MinGW notes URL.  (Bug#73528)

(cherry picked from commit 7abecbcd63317496369fffe69b6afab4af058ed6)

; Remove mentions of MH-E in Org

; * lisp/doc-view.el (doc-view-djvused-program): allow nil in type

(cherry picked from commit 336e977f18f0f823af229e037f0df71505366839)

; * lisp/files.el (save-some-buffers-action-alist): Fix comment.

(cherry picked from commit 598f15bcaf6fac41d58e438cb55571d0593de549)

; * doc/emacs/misc.texi (DocView Navigation): Fix wording.

(cherry picked from commit f3f57c11981489b1d19d2efb906820c98083cce1)

Add imenu index function for DjVu files in doc-view

* lisp/doc-view.el (doc-view-pdfdraw-program): Prefer mutool
over other names.
(doc-view-imenu-enabled): Tweak the default value to check for
'djvused', and make it obsolete.
(doc-view--djvu-outline, doc-view--parse-djvu-outline): Add new
functions to return imenu index for a Djvu file.
(doc-view--outline): Add new function to create the imenu index
depending on the file type.
(doc-view--outline): Document new possible variable value.
(doc-view-imenu-index): Use the above function instead.
(doc-view-imenu-setup): Try to create the imenu index
unconditionally.
* doc/emacs/misc.texi (DocView Navigation): Mention index
creation using 'djvused' too.
* etc/NEWS: Announce the change.  (Bug#73530)

(cherry picked from commit d6dd71cd56e73aaf998d27225249edf661ead488)

Fix term.el tests; refine previous change

Fix the term.el tests by making them match the new expected output.

* test/lisp/term-tests.el: defvar - defconst
(ansi-test-strings): remove unwanted text properties from
expectations

* lisp/term.el:
(term--handle-colors-list): further shrink common-case face list

(cherry picked from commit 5e0935d9917fe768f74311c6cb4dc3a1e9014c52)

; diff-delete-other-hunks manual entry: Expand explanation

(cherry picked from commit d9e76c87a120305abc4701acb496ced103b4b4fb)

; Fix word order in a recently-added comment

(cherry picked from commit eeeb13bed476a0d1b744f31c8e18513346cfbe39)

; Skip commit c3e989ca9d786e001a9801fdd95fcbcb0d73fddc

Add sentence and sexp movement to python-ts-mode

* lisp/progmodes/python.el (python-ts-mode): Add relevant node
types.  (Bug#60856)

(cherry picked from commit c9e30e8c77d903a117e9319b264c7b66af499713)

Fix two warnings in smerge.el

* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower): Fix warnings.

(cherry picked from commit 59dcd1143320ada0244aa309c98a0afa5f2eb5f5)

Prefer defcustom :local specifier

* lisp/dirtrack.el (dirtrack-list):
* lisp/emacs-lisp/lisp.el (defun-prompt-regexp):
* lisp/emulation/viper-init.el
(viper-related-files-and-buffers-ring):
* lisp/emulation/viper-util.el (viper-syntax-preference):
* lisp/erc/erc.el (erc-ignore-list):
* lisp/files.el (buffer-offer-save, backup-by-copying-when-mismatch):
* lisp/find-file.el (ff-pre-find-hook, ff-pre-load-hook)
(ff-post-load-hook, ff-not-found-hook, ff-file-created-hook)
(ff-case-fold-search, ff-always-in-other-window)
(ff-ignore-include, ff-quiet-mode, ff-other-file-alist)
(ff-search-directories):
* lisp/mh-e/mh-e.el (mh-scan-prog):
* lisp/newcomment.el (comment-column):
* lisp/obsolete/rlogin.el (rlogin-directory-tracking-mode):
* lisp/play/decipher.el (decipher-ignore-spaces):
* lisp/plstore.el (plstore-encrypt-to):
* lisp/proced.el (proced-format, proced-filter, proced-sort)
(proced-descend, proced-auto-update-flag, proced-tree-flag):
* lisp/progmodes/fortran.el (fortran-line-length):
* lisp/shell.el (shell-history-file-name):
* lisp/simple.el (goal-column, fill-prefix):
* lisp/vc/ediff-init.el (ediff-use-faces)
(ediff-highlight-all-diffs, ediff-autostore-merges):
* lisp/vc/ediff-merg.el (ediff-show-clashes-only)
(ediff-skip-merge-regions-that-differ-from-default): Prefer defcustom
:local specifier to using 'make-variable-buffer-local' directly.

(cherry picked from commit e20ce5fcc53593db5400596afee783d966ad2b2d)

; Skip commit bde00266db42213ca5da3fd8cde882c13b0dfdfb

; Update a comment accordingly

(cherry picked from commit 4d43fbe3f5782f2efe3b325df87b65da026ef212)

xref-location-marker: Use find-file-noselect to ensure uptodateness

* lisp/progmodes/xref.el (xref-location-marker):
Always call 'find-file-noselect' rather than 'get-file-buffer' to
go through the visited-file-modtime verification every time.

(cherry picked from commit a9e36fc3bf811853e152e7ff427a39272cff1a80)

track-changes.el: Improve error tracing to help debugging

Add a new `trace` setting for `track-changes-record-errors` to
record more information in order to try and help find the root
cause of errors.

* lisp/emacs-lisp/track-changes.el (track-changes--trace): New var.
(track-changes-record-errors): Document new `trace` setting.
(track-change--backtrace, track-changes--trace): New functions.
(track-changes--recover-from-error): Use them.
(track-changes--error-log): Document new format.
(track-changes-register, track-changes-unregister)
(track-changes-fetch, track-changes--before, track-changes--after):
Call `track-changes--trace`.

(cherry picked from commit ef587bf6b46b2ea3ef91b260ac2542666081260d)

* doc/misc/eieio.texi (Writing Methods): Typo

(cherry picked from commit 03a1e942c0b116b847832e5aa28e737547ea7f09)

(key-translate-select): Minor tweaks

* lisp/keymap.el (key-translate-select): Rename from
`key-select-translation` so as to stick to the `key-translate-` prefix.
Silence compilation warning.

(cherry picked from commit 0894d3835e8f841045cc7cd9db2184cac35fcbb1)

Add commands to interactively set/unset keyboard translations

* lisp/keymap.el (key-translate): Add an interactive form, prompting for
keys to translate, and update docstring to reflect this.
(key-translate-selection-function): New custom option.
(key-select-translation): New function, default value of above option.
(key-translate-remove): New command, for removing entries from
`keyboard-translate-table'.

(cherry picked from commit 3139ce7ad42ab883eee5189d6cb19612f525f491)

; Fix last change in gitlab-ci.yml

(cherry picked from commit 042eee61ee2dee3732ffc8c4d30a75fa4751f844)

; Skip commit 8683d64cc571500347a16e7cb7d144d723250489

* Fix few warnings in lisp/shell.el

* lisp/shell.el (shell-highlight-undef-defined-face)
(shell-highlight-undef-undefined-face)
(shell-highlight-undef-alias-face): Unquote :inherit argument.

(cherry picked from commit b9ebacf40345977ddf18531cb1ebf0f6c56045ae)

* src/comp.c (compile_function, Fcomp__compile_ctxt_to_file0): Use DOHASH.

(cherry picked from commit abb932290dff3ad7456477a7401df01e3105336f)

* etc/TODO (Native compiler improvements): Add entry.

(cherry picked from commit f985bab71bc58c51d9c9dad3bac78271de8d5290)

New M-~ entry in save-some-buffers-action-alist

* lisp/files.el (save-some-buffers-action-alist): New M-~ entry.
(save-some-buffers):
* doc/emacs/files.texi (Save Commands):
* etc/NEWS: Document the new M-~ binding during C-x s.

(cherry picked from commit cc2ad5c2d1508236e79658936e7c7f532ddba586)

Avoid assertion violations due to wrong 'min-width' property

* src/xdisp.c (display_min_width): Ignore 'min-width' display
specs which produce stretch glyphs wider than the window when
lines are truncated.  (Bug#73600)

(cherry picked from commit d5b02b7ad6fc67a10176a2ce56e14592252d3ed7)

; Minor changes in gitlab-ci.yml

* test/infra/gitlab-ci.yml (.job-template): Comment test prints.
(.test-template): Adapt paths:

(cherry picked from commit 748f76c5b325fe1e3c79f04d43a50af862944aa1)

Remove some Semantic mentions

Track nil colors in term

Teach term the difference between an unset foreground or
background color and a color that happens to match an existing
color.  This way, when we insert text after a color
reset:(e.g. from an SGR0), we insert it without :foreground or
:background (whichever we've reset) face properties, allowing
that inserted text to inherit the colors of the underlying face.

This way, if we change, e.g., the background color of a buffer,
the background color of already-inserted text from the term
child changes along with that of the buffer instead of being
"locked" to whatever the background color of the buffer was at
the time the text was inserted.

This change aligns term.el with other terminal emulators.

* lisp/term.el (term-ansi-current-color):
(term--color-as-hex): track nil fg, bg colors

(cherry picked from commit 3d609375f99cd0d4b7a441802d4616bad385e31d)

Make xref-find-references work in Help buffers outside of projects

* lisp/help-fns.el (xref-backend-references):
New context-dependent override.  Don't call project-current and
use elisp-load-path-roots directly (bug#69462).
(help-fns--setup-xref-backend): No need to set
project-vc-external-roots-function then.

(cherry picked from commit ad529831018555b4c693844bc3b18766eb78465a)

; Rework documentation for diff-delete-other-hunks

(cherry picked from commit 11e7aa75eeba3c0d24d84782639b48c64c8e1ea3)

Use Emacs Lisp xref backend in Lisp Help buffers

* lisp/help-fns.el (help-fns--setup-xref-backend):
New function (bug#69462).
(describe-function, describe-variable): Use it here.

* lisp/emacs-lisp/cl-extra.el (cl-describe-type): And here.

* lisp/progmodes/elisp-mode.el (xref-backend-definitions):
Only infer namespace in emacs-lisp-mode (use 'any' otherwise).

(cherry picked from commit c8ecd7fa0da8a597250989430ac2b2465419f18e)

Process focus-in events immediately on NS

* src/nsterm.m ([EmacsView windowDidBecomeKey]): kick the main
event loop when we get a focus-in event so it gets processed
immediately (Bug#73559).

(cherry picked from commit 79d66b4b2970b915abfde516d867107afa19348f)

Prefer defcustom :local specifier in textmodes

* lisp/textmodes/fill.el (default-justification):
* lisp/textmodes/ispell.el (ispell-local-dictionary)
(ispell-skip-html):
* lisp/textmodes/less-css-mode.el (less-css-output-file-name)
(less-css-input-file-name):
* lisp/textmodes/refer.el (refer-bib-directory, refer-bib-files)
(refer-cache-bib-files):
* lisp/textmodes/two-column.el (2C-separator, 2C-window-width):
Prefer defcustom :local specifier to using 'make-variable-buffer-local'
directly.

(cherry picked from commit 4bb62af3263057312021e076dc7e0c8ff195e38f)

; Fix thinko in my last change

* lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): Fix thinko.
* test/lisp/emacs-lisp/bytecomp-tests.el
(bytecomp-test-defcustom-local): Update test.

(cherry picked from commit 67e807d897077b7c982104b528e2504591214a29)

New function shell-command-do-open

* lisp/dired-aux.el (shell-command-do-open): Factor out of
dired-do-open.
(dired-do-open): Call shell-command-do-open.
* etc/NEWS: Announce the new function.

(cherry picked from commit 9e51815265b9837a8311ee28af39e6b78dd18e29)

Move error check from vc-next-action to diff-vc-deduce-fileset

* lisp/vc/diff-mode.el (diff-vc-deduce-fileset): Signal
user-error when the buffer is narrowed.
* lisp/vc/vc.el (vc-next-action): Remove code signalling a
user-error when the buffer is narrowed.

(cherry picked from commit 7aa106b8bf382f18342975e388720399554e2968)

Warn about bad defcustom :local keyword at compile time

* lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): Warn about
invalid values for the defcustom :local keyword.
* test/lisp/emacs-lisp/bytecomp-tests.el
(bytecomp-test-defcustom-local): New test.

(cherry picked from commit fb42a253bdcbdc9f8af5f934cab4aa24d5b541bd)

New value 'permanent-only' for defcustom :local keyword

* lisp/custom.el (custom-declare-variable): Make the :local keyword
accept the symbol 'permanent-local', meaning that the variable is
permanent but not marked as automatically buffer-local.
(defcustom):
* doc/lispref/customize.texi (Variable Definitions): Document the
above change.

* test/lisp/custom-tests.el
(custom-tests-defcustom-:local-keyword): New test.

(cherry picked from commit 9ad73f92617da1286724f9774b34bb7ce6a4299d)

; Skip commit 6a68334d54667f78879deb2b03676e4c28d7a6a6

Prefer defcustom :local specifier in allout

* lisp/allout-widgets.el (allout-widgets-track-decoration):
* lisp/allout.el (allout-inhibit-auto-fill)
(allout-inhibit-auto-fill-on-headline, allout-use-hanging-indents)
(allout-reindent-bodies, allout-show-bodies, allout-header-prefix)
(allout-primary-bullet, allout-plain-bullets-string)
(allout-distinctive-bullets-string, allout-old-style-prefixes)
(allout-stylish-prefixes, allout-numbered-bullet)
(allout-presentation-padding, allout-encrypt-unencrypted-on-saves)
(allout-enable-file-variable-adjustment): Prefer defcustom :local
specifier to using 'make-variable-buffer-local' directly.

(cherry picked from commit df8d8a786f10de780235618cdf9af7fbc139620c)

Use defvar-keymap in lua-ts-mode

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-map): Replace
'defvar' with 'defvar-keymap'.  (Bug#73585)

(cherry picked from commit bf3129d5821bb8804e486bc5d51de04846a31f12)

Fix warning in dictionary.el

* lisp/net/dictionary.el (dictionary-word-entry-face): Fix face
attribute.

(cherry picked from commit e1815536622c646ce56a06c0b85801003b303a01)

Prefer defvar-local where possible

* lisp/editorconfig.el (editorconfig-properties-hash):
* lisp/emacs-lisp/comp-run.el (comp-last-scanned-async-output):
* lisp/info-look.el (info-lookup-mode):
* lisp/mh-e/mh-folder.el (mh-generate-sequence-font-lock):
* lisp/net/tramp.el (tramp-temp-buffer-file-name):
* lisp/obsolete/iswitchb.el (iswitchb-eoinput):
* lisp/obsolete/longlines.el (longlines-wrap-beg, longlines-wrap-end)
(longlines-wrap-point, longlines-showing, longlines-decoded):
* lisp/obsolete/tpu-edt.el (tpu-newline-and-indent-p)
(tpu-newline-and-indent-string, tpu-saved-delete-func)
(tpu-buffer-local-map, tpu-mark-flag):
* lisp/progmodes/python.el (python-check-custom-command):
* lisp/textmodes/reftex.el (reftex-docstruct-symbol)
(reftex-isearch-minor-mode): Prefer defvar-local where possible, and
the package does not support Emacs 24.3 or earlier.

(cherry picked from commit e792856b001f260572b4012241748c41e045c638)

* lisp/emacs-lisp/package.el (package-isolate): Use `package-activate-all`

`package-initialize` is used to initialize the whole machinery needed
to list/download/install/remove packages, whereas here we only need to use
the installed packages.

(cherry picked from commit ff87166227b2634e45591e8c73db9b102734ab77)

* Don't iterate over an hash table while modifyiong it in comp.

* lisp/emacs-lisp/comp.el: Don't iterate over the hash values directly
as 'comp--add-cond-cstrs-target-block' can modify the hash content.

(cherry picked from commit 372ce6adbf39c5b9ec92e103abe70af872085119)

; Skip commit 3e92f952aa15ff3dd3f9a8523646252dcb1dc412

New command diff-delete-other-hunks

* lisp/vc/diff-mode.el (diff-delete-other-hunks): New
command (bug#73387).
(diff-mode-map): Bind the new command to C-c RET n.
(diff-mode-menu): New entry for the new command.
(vc-next-action): Stop, and warn, if the user attempts to commit
a patch from a narrowed buffer (bug#73387).
* doc/emacs/files.texi (Diff Mode):
* etc/NEWS: Document the new command.

(cherry picked from commit b64f69f6dcc08e5aeea0464f6d8b560ed7002d36)

cond-star: Fix copyright

* lisp/emacs-lisp/cond-star.el: Fix copyright year and license
statement.

(cherry picked from commit f95d4208b6bcfbbf95c956d8a66faa92aa5e4965)

cond-star: Fix trivial typos, checkdoc fixes, etc.

* lisp/emacs-lisp/cond-star.el (cond*):
Add header and footer as per checkdoc fixes.

(match*, cond*-non-exit-clause-substance)
(cond*-convert-clause, cond*-convert-condition)
(cond*-match, cond*-subpat)
(cond*-used-within, cond-star):
Fix typos in comments, and apply checkdoc fixes.  (Bug#72546)

(cherry picked from commit 4197a8450669e08c2d26f4a7d77dcb2771bd9492)

; * nt/inc/ms-w32.h: Fix comments (bug#73444).

(cherry picked from commit 84261bd2b702605da58c6e12660ffd076a898766)

Fix redirection of read when _FORTIFY_SOURCE is defined

When _FORTIFY_SOURCE is defined mingw-w64 provides an inline definition
of read in io.h.  This makes our previous redirection to sys_read
ineffective.  The prototype of sys_read is now required because we don't
touch the prototype of read.

* nt/inc/ms-w32.h (read): Move the redirection after io.h.  Add prototype
for sys_read (Bug#73444)

(cherry picked from commit e376a27cf27d453f3b1c2728626950d4c4478f48)

Delete some libraries obsolete since Emacs 24.4/24.5

* lisp/obsolete/cc-compat.el:
* lisp/obsolete/info-edit.el:
* lisp/obsolete/meese.el:
* lisp/obsolete/otodo-mode.el:
* lisp/obsolete/rcompile.el:
* lisp/obsolete/sup-mouse.el:
* lisp/obsolete/terminal.el:
* lisp/obsolete/vi.el:
* lisp/obsolete/vip.el:
* lisp/obsolete/ws-mode.el:
* lisp/obsolete/yow.el: Delete libraries obsolete since Emacs 24.4 and
24.5.  (Bug#73257)

* doc/misc/vip.texi:
* etc/refcards/vipcard.tex: Delete vip.el documentation.

* doc/emacs/ack.texi (Acknowledgments):
* doc/misc/Makefile.in (INFO_COMMON):
* etc/refcards/Makefile (PDF_ENGLISH, survival.dvi):
* etc/refcards/README:
* lisp/info.el (Info-url-alist):
(Info-file-list-for-emacs): Delete references to above libraries.

(cherry picked from commit 685ec273ecbb54439ed84474fb96ec847bebb630)

Remove erc-fill binding for cycling visual movement

* etc/ERC-NEWS: Announce removal of troublesome key binding first
introduced in ERC 5.6 as part of the `erc-fill-wrap' module.
* lisp/erc/erc-fill.el (erc-fill-wrap-mode-map): Remove key binding for
`erc-fill-wrap-cycle-visual-movement'.
* test/lisp/erc/erc-fill-tests.el (erc-fill-wrap-visual-keys--body)
(erc-fill-wrap-visual-keys--prompt): Replace "C-c a" key simulations.
(Bug#73553)

(cherry picked from commit e3c45b9d707db824588e2bd9ae34c05911dfcc5a)

Skip indentation when gathering faces in erc-track

* lisp/erc/erc-nicks.el (erc-nicks-mode, erc-nicks-enable)
(erc-nicks-disable): Use correct name for `track' module hook.
(erc-nicks--check-normals): Remove falsity from doc string.
* lisp/erc/erc-track.el (erc-make-mode-line-buffer-name): Don't error
when optional COUNT is nil.
(erc-track-modified-channels): Use new name for preferred face-finding
function.
(erc-track--get-faces-in-current-message, erc-track--collect-faces-in):
Rename former to latter to better reflect expanded utility, which now
includes spanning gaps, including newlines and indentation that may be
lacking in face-related properties.
* test/lisp/erc/erc-track-tests.el (erc-track--collect-faces-in): New
test.  (Bug#73443)

(cherry picked from commit df593b5a619d63b620f8fd569ecf032dab2602d9)

Make erc-keep-place-indicator aware of erc-truncate

* etc/ERC-NEWS: Entry mentioning `erc-keep-place-indicator-truncation'.
* lisp/erc/erc-goodies.el (erc-keep-place-indicator-truncation): New
option.  Something like this should have accompanied the module's
introduction.
(erc-keep-place-indicator-mode, erc-keep-place-indicator-enable)
(erc-keep-place-indicator-disable): Arrange to take necessary measures
to avoid losing the indicator on `erc--clear-function'.  This module was
first introduced by bug#59943.
(erc--keep-place-move-hook): New variable.
(erc--keep-place-indicator-adjust-on-clear): New function.
(erc-keep-place-move): Try to ensure the overlay resides at the
beginning of a message.  Run hook `erc--keep-place-move-hook'.
* test/lisp/erc/erc-scenarios-keep-place-indicator-trunc.el: New file.
* test/lisp/erc/erc-scenarios-keep-place-indicator.el
(erc-scenarios-keep-place-indicator--follow): Fix missing test
description.  (Bug#72736)

(cherry picked from commit 4d7f41716e1485fb57efc6eac9f45f2879c90266)

Redo ERC truncation and /CLEAR hook mechanism

* etc/ERC-NEWS: Mention option `erc-truncate-padding-size'.
* lisp/erc/erc-fill.el (erc-fill-wrap-mode, erc-fill-wrap-enable)
(erc-fill-wrap-disable): Manage membership in the `erc--clear-function'
advice stack for own function that massages a buffer's oldest inserted
message, post truncation.
(erc-fill--wrap-massage-initial-message-post-clear): New function.
* lisp/erc/erc-log.el (erc-log-mode, erc-log-enable): Don't add
`erc-save-buffer-in-logs' to `erc--pre-clear-functions'.  Use local
advice around common interface variable instead, as noted below.
(erc-log-disable): Likewise, don't remove `erc-save-buffer-in-logs' from
`erc--pre-clear-functions'.
(erc-log-setup-logging): Add `erc-log--save-on-clear' to
`erc--clear-function'.
(erc-log-disable-logging): Remove `erc-log--save-on-clear' to
`erc-clear-function'.
(erc-save-buffer-in-logs): Abort when `erc--insert-marker' is non-nil.
(erc-log--save-on-clear): New function, a thin wrapper around
`erc-save-buffer-in-logs', adapting it to the `erc--clear-function'
advice interface.
* lisp/erc/erc-stamp.el (erc-stamp-mode, erc-stamp-enable): Don't
add `erc-stamp--reset-on-clear' to `erc--pre-clear-functions'.
(erc-stamp-disable): Don't remove `erc-stamp--reset-on-clear' from
`erc--pre-clear-functions'.
(erc-stamp--find-insertion-point): Account for initial position being
`bobp'.
(erc-stamp--defer-date-insertion-on-post-modify): Accommodate the rare
non-list `erc-insert-post-hook' when shadowing.
(erc-stamp--setup): Add and remove `erc-stamp--reset-on-clear' to and
from `erc--clear-function' advice stack.
(erc-stamp--redo-right-stamp-post-clear): New function.
(erc-stamp--update-saved-position): Remove unused function.  This was
originally added along with `erc-stamp--reset-on-clear' as part of
bug#60936.
(erc-stamp--reset-on-clear): Expect end of truncation boundary to be at
`erc-insert-marker'.  Rework to use new `erc--clear-function' interface
and run on `erc-timer-hook' instead of `erc-insert-done-hook'.
* lisp/erc/erc-truncate.el (erc-truncate-padding-size): New option to
help tamp down on disruptions when reading scroll back caused by overly
frequent truncation.
(erc-truncate-enable, erc-truncate-disable): Add and remove
`erc-truncate--setup' to and from `erc-mode-hook', and run it when
needed.
(erc-truncate--buffer-size): New variable.
(erc-truncate--setup): New function.
(erc-truncate-buffer-to-size): Guard execution with
`erc-truncate--padding-size' and `erc--inhibit-clear-p'.  Reflow for
readability, removing obsolete comments.  Call hooks with marker instead
of buffer position, as per the new `erc--clear-function' interface.
(erc-truncate-buffer): Defer execution to `erc-timer-hook' when running
post-insertion via a response handler.
(erc-truncate--inhibit-when-local-and-interactive): New function.
* lisp/erc/erc.el (erc-mode): Add `erc--skip-past-headroom-on-clear'
to `erc--clear-function' in all ERC buffers.
(erc--with-spliced-insertion): Account for marker being `bobp'.
(erc--insert-before-markers-transplanting-hidden): Make more robust by
accommodating initial `point' possibly being `bobp'.
(erc--clear-function): New variable, a function-valued local-advice
interface to replace `erc--pre-clear-functions'.
(erc--pre-clear-functions): Remove unused variable.
(erc--skip-past-headroom-on-clear): New function.
(erc--inhibit-clear-p): New variable.
(erc-cmd-CLEAR): Call hooks with markers instead of position.  Signal
`user-error' when `erc--inhbiit-clear-p' is non-nil.
* test/lisp/erc/erc-scenarios-log.el (erc-scenarios-log--clear-stamp)
(erc-scenarios-log--cmd-clear/date-stamps): Rename former to latter,
update assertions, and use common helper.
(erc-scenarios-log--cmd-clear/left-stamps): New test.
(erc-scenarios-log--truncate): Move body to function of the same name,
and update assertions.
(erc-scenarios-log--truncate/left-stamps): New test.  (Bug#72736)

(cherry picked from commit 51d5419fdc3805a95190f8913e8ea349f243f11d)

Fix overlooked case in erc--get-inserted-msg-beg-at

* lisp/erc/erc.el (erc--get-inserted-msg-beg-at): Account for the start
of a props header being `bobp' when searching backwards.
(erc--get-inserted-msg-prop): Add optional `point' parameter.
* test/lisp/erc/erc-goodies-tests.el
(erc--get-inserted-msg-beg/truncated/readonly): New test.
* test/lisp/erc/erc-tests.el (erc--get-inserted-msg-beg/truncated): New
test.
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests-common-assert-get-inserted-msg/truncated): New test helper.
(Bug#72736)

(cherry picked from commit 08f662da1123f50f3f62d0af747bff88d2c73938)