; Skip commit 339ffd79862c322f5b75fed1b55d61efe90bc7a1

* doc/misc/tramp.texi (Customizing Methods): Add incus-tramp.

(cherry picked from commit 9c94363894ced4ed84014cf0dc347af7882643e6)

; Skip commit 6a272dedad384614190ee04bf1a47aff05c7dd3b

; Skip commit c0f10fc3d486fb86216bd7278d932a75f83c1d65

Remove duplicate indent rules in elixir-ts-mode

* lisp/progmodes/elixir-ts-mode.el (elixir-ts-mode): There are
two forms adding heex-ts--indent-rules, remove one of them.

(cherry picked from commit 52746ceb62592fba6d58595b7bc3199058f30185)

Set treesit-primary-parser for tree-sitter modes

I debated whether to do this, since technically speaking it's
not needed for single-language modes.  But ultimately it's
better to be explicit and set a good example with builtin modes.

* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode):
* lisp/progmodes/csharp-mode.el (csharp-ts-mode):
* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode):
* lisp/progmodes/go-ts-mode.el (go-ts-mode):
(go-mod-ts-mode):
* lisp/progmodes/heex-ts-mode.el (heex-ts-mode):
* lisp/progmodes/java-ts-mode.el (java-ts-mode):
* lisp/progmodes/json-ts-mode.el (json-ts-mode):
* lisp/progmodes/lua-ts-mode.el (lua-ts-mode):
* lisp/progmodes/python.el (python-ts-mode):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
* lisp/progmodes/sh-script.el:
* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode):
(tsx-ts-mode):
* lisp/textmodes/css-mode.el (css-ts-mode):
* lisp/textmodes/html-ts-mode.el (html-ts-mode):
* lisp/textmodes/toml-ts-mode.el (toml-ts-mode):
* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Set
treesit-primary-parser.

(cherry picked from commit ed57faafc74e0810b492841deccb3cdc77a258ff)

poject--vc-list-files: Check that the current Emacs is 31+

* lisp/progmodes/project.el (project--vc-list-files):
Check that the current Emacs is 31+, to avoid breakage on remote
hosts with older Git (bug#73320).

(cherry picked from commit 70d064dab74ac7928eeacb61c03605b99de995a9)

Detect Git version on remote hosts separately from the local one

* lisp/vc/vc-git.el (vc-git--program-version): Detect Git version
on remote hosts separately from the local one (buf#73320).
(vc-git-connection-default-profile): Set up collection-local
profile.  And use it for the 'vc-git' :application.
(vc-git--program-version): Operate on the connection-local value
of 'vc-git--program-version'.

(cherry picked from commit 7cd8108098c08de47078db4e17291e5a529e0ae0)

Support file creation and deletion in diff-apply-hunk

* lisp/vc/diff-mode.el (diff-find-file-name): Allow entering
non-existing file name when the corresponding hunk is of type
"create file" (bug#62731).  Default to file name with deleted
prefix if diff-buffer-type is Git or Hg.  Make sure not to add
such input to diff-remembered-files-alist, it would be hard to
change otherwise in case of typo.
(diff-setup-buffer-type):
Match against the diff header common to 'hg diff' output.
(diff-find-source-location): Look at the other source when the
buffer is applied in reverse.
(diff-apply-hunk): Delect file deletion and pass a different
argument to 'diff-find-source-location' in such case.  Bind
diff-vc-backend to nil to avoid older revision buffer being
returned.  In the end, offer to delete the file if the hunk was of
corresponding type and matched the existing contents.

* etc/NEWS: Mention the new capability.

(cherry picked from commit 2d139141a6c249691a50ade9c8d08dc35fcdf456)

Support calling 'project-current' with custom prompt

* lisp/progmodes/project.el (project-current): Treat being passed
a string in the MAYBE-CURRENT argument specially (bug#70833).
(project-prompt-project-dir, project-prompt-project-name):
Handle it.

* etc/NEWS: Mention that change.

(cherry picked from commit 9904376c797665de47ff760bcf8c2fe33d7ae625)

; * lisp/emacs-lisp/cl-macs.el (cl-once-only): Fix capitalisation.

(cherry picked from commit 37a6c859b04ef9f88c3f9751027d544100cf1d2c)

Delete XIE X extension from TODO

According to Wikipedia, XIE "is no longer included in the X11 reference
distribution, having been removed with X11R6.7 in 2004."
Ref: https://en.wikipedia.org/wiki/X_Image_Extension

* etc/TODO: Delete item to use XIE X extension.

(cherry picked from commit 2d4d6dc43a417b873024d1bee93036d3749f59af)

New command load-libraries-for-prefix

Support autoloading Tramp extensions just in time

Fix bootstrap

* lib-src/etags.c (C_entries): Fix assertion violation.

(cherry picked from commit ff4de9eff30ade164655354f71e7cbca48135858)

; Fix completion of variables in Eshell immediately after "$"

* lisp/eshell/esh-var.el (eshell-complete-variable-reference): Match
group 1 even when there's nothing after "$".

(cherry picked from commit 49325e13560daa768e6f455ade8c9284b7369a26)

Remove some dead code

; Skip commit 8c5d69998e65d3ecf5f599bd828bf3330f4f118a

; Skip commit 1adcbdb21c19b42552736b60a5c1629b5d53a7a2

* lisp/vc/diff-mode.el (diff-apply-buffer): Add more failures.

Add 'failures' as an argument to the 'message' call.

(cherry picked from commit 9102f1eaafd51404ca93dacec8785dccad2a2ea0)

help-setup-xref: Simplify further

* lisp/help-mode.el (help-setup-xref): Simplify, given that the
vars are marked 'permanent-local' already (bug#73637).

(cherry picked from commit 61c91389a4da90645562a8b80858e62b7526cdd6)

Drop verilog-mode.el and clean up some dead code

Simplify xref regular expression with rx

* lisp/progmodes/xref.el (xref--regexp-to-extended): switch to rx
regular expression for legibility

(cherry picked from commit 500f5da5fb62cd0bbded8df754d93e3147d1d847)

help-setup-xref: Keep the local values only of some variables

* lisp/help-mode.el (help-setup-xref): Kill all local variables,
saving ones that are known to need to be preserved (bug#73637).

(cherry picked from commit e776df2a3eae0454ea85287e15ebba649bf8e918)

CC Mode: Remove search limit to fontify first decl in xdisp.c

An unneeded 10,000 character search limit prevents the full
fontification of the first declaration of xdisp.c, since the
introductory commentary is longer than that.

* lisp/progmodes/cc-engine (c-find-decl-spots): Remove the
10,000 char limit.

(cherry picked from commit 4c7a6dc1a0ce8fe7bb603c907efb52d2ecf30858)

Remove redundant face specs in manoj-dark theme

* etc/themes/manoj-dark-theme.el (manoj-dark): Remove redundant face
specs.  ':bold t' duplicates ':weight bold', and ':italic t' duplicates
':slant italic'.

(cherry picked from commit 24fe762503ee5e36f49f01e538d89ab986f1f593)

; Skip commit d54e7f13926f88bd012ab999e2bf048f45187f86

; * lisp/progmodes/csharp-mode.el (treesit-query-compile): Declare.

(cherry picked from commit b68b9f291cc52f6120858534ff450fa7f6381d0b)

; * lisp/window.el (switch-to-prev-buffer-skip-regexp): Doc fix (bug#73545).

(cherry picked from commit 688201ef18df468dc8c7e8eb2ce6a96a9c625517)

; Skip commit ba44fc9a447be75eff304f606e0cc9ea7ba7656a

Revert "Support electric-layout-mode in python-base-mode"

This reverts commit 9b814a0268e794e6d900a9a16cb45c685b7af8c3.

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

This reverts commit 02e5cc293a93994bf52d5e0b911f2e4733c5bb20.

; * etc/NEWS: Fix formatting.

(cherry picked from commit b2ebba1d3cdcda9197ddce9ee14cd6184eca7131)

; 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)