* lisp/treesit-x.el: New file.

* lisp/treesit.el (treesit--copy-queries): New function.
(treesit--install-language-grammar-1): Use it.

https://lists.gnu.org/archive/html/emacs-devel/2025-03/msg01312.html
(cherry picked from commit 050325da303996cf5be7bd13d0a13e0bd12fa25e)

lisp/gnus/mm-encode.el (mm-default-buffer-type): Obey the mode hierarchy

(cherry picked from commit e67f03bf35b97d2898b64281215be6717b659839)

* lisp/gnus/mm-encode.el (mm-default-buffer-type): Check `major-mode'.

(cherry picked from commit a15534f32e1a978dee6ec96d6b60b5e755666e70)

Rename 'buffer-too-small' to 'memory-buffer-too-small'.

This clarifies that the error isn't talking about an editing buffer.

* src/emacs-module.c (module_memory_buffer_too_small): Rename from
'module_buffer_too_small'.
(module_copy_string_contents, module_extract_big_integer): Adapt
callers.
(syms_of_module): Rename symbol 'buffer-too-small' to
'memory-buffer-too-small'.

(cherry picked from commit 0b1102a70413dabba082d822c200b014464de667)

Use better attachment defaults for *diff* buffers

* lisp/gnus/mm-encode.el (mm-default-buffer-type): New defun.

* lisp/gnus/mml.el (mml-attach-buffer): Use it.

(cherry picked from commit 2adc912d0ec277d9ffe6485e7d81849fab98a2ea)

* test/infra/Dockerfile.emba (emacs-tree-sitter): Add gowork grammar.

(cherry picked from commit d6c7a77465203bfc277ff489be0f4f4d476615c7)

outline-move-subtree-down/up: Fix for non-nil outline-blank-line

* lisp/outline.el (outline-move-subtree-down):
Include blank line when outline-blank-line is t
(bug#77238).

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

(built-in-class--make): Take list of types rather than classes

Consolidate the conversion from types to classes into
`built-in-class--make` instead of duplicating it in ever caller.

* lisp/emacs-lisp/cl-preloaded.el (built-in-class--make): Take list of
types rather than classes.
(cl--define-built-in-type): Simplify accordingly.

(cherry picked from commit 7ec0ee742da17864b554e2cf4384d2a12baaf1e8)

; * msdos/emacs.djl: Don't interfere with the order of other symbols.

(cherry picked from commit c3492b969da3b117904a070a2617b31dd965f109)

Fix the DJGPP build

* msdos/emacs.djl (.bss): Guarantee that lread.o is 8-byte
aligned.

* msdos/sed2v2.inp (ALIGNOF_INT, ALIGNOF_LONG)
(ALIGNOF_LONG_LONG): Correct typos.

* src/term.c (tty_free_frame_resources): Synchronize with
non-DOS variant.

(cherry picked from commit 49eab999f13fede351ab7700c1469ba6cbf3d6b8)

Mimic behavior of 'aref' when signalling out-of-range errors.

The convention used by 'aref' and friends is that for
'args-out-of-range', the error data is a list (SEQ INDEX).  Use the same
convention for the vector-related module functions.

* src/emacs-module.c (check_vec_index): Use vector and index as error
data.

(cherry picked from commit 8efcdcab8658ff9537fe483e0a12875cca90a527)

Don't use 'args-out-of-range' error for too-small buffers.

'args-out-of-range' means that some index argument isn't valid for a
given sequence/range, which isn't the case here.  Instead, define a new
error symbol to mean "user-supplied buffer is too small."  Since we
never specified nor tested which error symbol was signalled in this
case, changing it shouldn't cause severe breakages.

* src/emacs-module.c (module_buffer_too_small): New helper function.
(module_copy_string_contents, module_extract_big_integer): Use it.
(syms_of_module): Define 'buffer-too-small' error symbol.

(cherry picked from commit 96a1a07fb1f9d8f3f41f3893ed1b624246a76c43)

Add an ERT explainer for 'time-equal-p'.

* lisp/emacs-lisp/ert.el (ert--explain-time-equal-p): New explainer
function.

* test/lisp/emacs-lisp/ert-tests.el (ert-test-explain-time-equal-p): New
test.

(cherry picked from commit 8be7e98557df8ba708b3f7e285a29f279b609e46)

lisp/loadup.el (max-lisp-eval-depth): Bump up a bit

This is to accommodate the deep backquoted thingy in `cus-start.el`.

(cherry picked from commit cf6d0b48d83ce93e792ef60f6f55f61ebb6f30cf)

Expose some lambdas currently hidden in quoted data

* lisp/language/chinese.el ("Chinese-GB", "Chinese-BIG5")
("Chinese-CNS", "Chinese-EUC-TW", "Chinese-GBK"):
* lisp/isearch.el (isearch-menu-bar-map):
* lisp/international/mule-cmds.el (language-info-custom-alist):
* lisp/font-lock.el (cpp-font-lock-keywords):
* lisp/cus-start.el (<toplevel>): Expose lambda-expressions to the compiler.

(cherry picked from commit f66c92a793557f6ac14f6dd07ad97f3a6057b3c9)

(byte-compile-maybe-guarded): Make its code edebuggable

* lisp/emacs-lisp/bytecomp.el (byte-compile--reify-function): Hoist
subexpression out of `if`.
(byte-compile-variadic-numeric, byte-compile--cond-vars)
(byte-compile--cond-switch-prefix, byte-compile-file-form-defalias):
Obey `lexical-binding` when evaluating the code we're compiling.
(byte-compile--maybe-guarded): New function, extracted from
`byte-compile-maybe-guarded`.
(byte-compile-maybe-guarded): Use it so we can edebug the code.

(cherry picked from commit c26862a6c9f2d46f41b4f91972d139a138cb2edf)

(buffer-local-set-state): Optimize away unused data

* lisp/subr.el (buffer-local-set-state--get): Simplify by making it
take only the vars rather than the pairs.
(buffer-local-set-state): Adjust accordingly so we don't needlessly keep
part of the source code in the compiled code.

(cherry picked from commit e343055f63b7329292641d0bca7d03183f35d871)

New test for function-get

* test/lisp/subr-tests.el (subr-tests-function-get): New test.

(cherry picked from commit 4194d5af4585fedfc7f148da72431a67a9c26045)

; Skip commit 119931a9cee4c25e7c5536c9bb75c038a1cd7cd3

; Skip commit 0c32f7521b12c13ac0c7fff09981054e106989c6

log-edit: Don't add rear-nonsticky to font-lock-extra-managed-props

* lisp/vc/log-edit.el (log-edit-mode): Don't add rear-nonsticky
to font-lock-extra-managed-props (bug#77197).  Investigated by
Paul D. Nelson <ultrano@gmail.com>.  Fix due to Stefan Monnier.

(cherry picked from commit 0503766495cabcf6e891094e723026d663e1c580)

Add basic and low-level tests for hash tables

* test/src/fns-tests.el (test-hash-table)
(test-hash-table-wrong-keywords, test-remhash, test-clrhash)
(test-hash-table-p, test-hash-table-count, test-maphash)
(test-copy-hash-table): New tests.

(cherry picked from commit 5830d1fa6552ad584daa574135e704d1f1e0220a)

Improve docstring of cl-defstruct accessors

* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Improve generated
docstring by not leaking the internal CL-X argument name, preferring X
instead.  Set property 'document-generalized-variable', used below.
* lisp/help-fns.el (help-fns--generalized-variable): When function has
non-nil property 'document-generalized-variable', document it as a
generalized variable.

(cherry picked from commit 1b56e0f1694650c3c567b90e1ae3caa0bfea209e)

Add a choice to 'dired-movement-style' to restore the previous behavior

* lisp/dired.el (dired-movement-style): Add new values
'bounded-files' and 'cycle-files' (bug#76596).
(dired--move-to-next-line): Use new values for users
who prefer the default behavior of Emacs 30.1.

(cherry picked from commit bc51fabc108ceccd4824ba6c6f0c29f143ebf47a)

; Fix some markup in doc/lispref/commands.texi.

(cherry picked from commit 10d534023a9aa1ffdfa0109f114630ff2eb9cf65)

Improve docstring of should-error

* lisp/emacs-lisp/ert.el (should-error): Improve docstring.

(cherry picked from commit c2c287b3252e2cd3223f2e2d0ef96f29e024b47b)

* lisp/treesit.el (treesit-indent-region): Handle markers (bug#77077).

Ensure that markers are converted to integers for 'beg' and 'end'.

(cherry picked from commit 84abd43f42fec623d4939e3557a1da2b83e08562)

; * lisp/simple.el: Drop some cruft.

Drop cl-font-lock.el

; Move time-stamp release info from symbol-releases.eld to NEWS

Update the appropriate historical NEWS files with time-stamp feature
releases.  Suggested by Stefan Monnier.  All dates are from my notes.

* etc/symbol-releases.eld: Remove time-stamp,
reverting commit 69210eb84e of 17 March.
* etc/NEWS.19:
* etc/NEWS.20: Add 'time-stamp' feature paragraphs that
should have been written then.
* etc/NEWS.21: Add missing quotes, so symbol names can be identified.

(cherry picked from commit 9e005e9da06f71441e643f7ecbe309e35f68680a)

Fix a nativecomp type propagation bug (bug#74771)

* lisp/emacs-lisp/comp.el (comp--add-cond-cstrs): Don't emit negated
cstr.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Add a test.

(cherry picked from commit d565a6747a2bb3c6699a95e60e5f522f80a1ca0a)

checkdoc: Delete redundant check for wide docstrings

With Emacs 28.1, wide docstrings are now flagged by the byte-compiler.
The logic in the byte-compiler for catching these issues is complex
and continuously evolving, particularly to avoid incorrectly flagging
`substitute-command-keys` substitutions.  Unfortunately, the checkdoc
implementation incorrectly flags correct docstrings as overly wide.

Rather than duplicating the byte-compiler logic in checkdoc, which
would introduce unnecessary maintenance overhead, we acknowledge that
this check is now redundant and remove it.  Users utilizing the
byte-compiler, whether manually or through `flymake`, will continue to
be warned about this issue.

* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
Remove check for overly wide docstrings; duplicates byte-compiler
logic.

(cherry picked from commit 408ad273eeadf72dea11b89ea2a44f36ea0e2295)

Patch bug#77128

* src/pgtkterm.c (pgtk_flash): Destroy `cr_surface_visible_bell'
if still present.  (bug#77128)

(cherry picked from commit 7d14e35498209e45290f5c1297ded6d7175bf1ea)

Improve documentation of cl-defstruct

* doc/misc/cl.texi (Structures): Organize more logically, slightly
expand, and add more examples.

(cherry picked from commit 81404bf3c2695dbd5a78e40ea8dd0547c1cca30c)

Avoid rare crashes due to "C-g C-g" on TTY frames

* src/term.c (tty_send_additional_strings): Don't use SBYTES, as
this function could be called in the middle of GC.  (Bug#77205)

(cherry picked from commit 939a2a3c2dd60503c6ebef839b5f05f962d405ce)

; * src/dispnew.c (check_window_matrix_pointers): Fix last change.

(cherry picked from commit 467aba67db407e930fc5de6d4a4ae0cd6fc106df)

Avoid rare segfaults in 'check_matrix_pointers'

* src/dispnew.c (check_window_matrix_pointers): No-op if the
window's frame not ready yet.  (Bug#77200)

(cherry picked from commit e20e8538610ed8b78e0b9f9cc3121c1102a8aaf0)

Consistent wording in top-level headers in NEWS.19

* etc/NEWS.19: Put the word "Emacs" in front of each version number.
This change lets 'help-fns--first-release' parse the headers, which
produces more accurate "probably introduced at" versions from
'describe-function' and 'describe-variable'.

(cherry picked from commit aa12cebaa684d7b3ea7e131666d33bcc71b45625)

Reduce code duplication in ns_set_appearance

* src/nsterm.h (ns_set_appearance_1): Declare.
* src/nsterm.m (ns_set_appearance_1): Break out new function...
(ns_set_appearance): ...here.
* src/nsfns.m (Fx_create_frame): Use above new function.

(cherry picked from commit 92b373318d2401f98f0ad5590ef799904c96506f)

Ensure .dir-locals-2.el behavior as documented (bug#75890)

* lisp/files.el
(dir-locals--all-files): New &optional 'base-el-only' argument.
(dir-locals--base-file): New function.
(dir-locals-find-file): 'locate-dominating-file' only for the base
.dir-locals.el.

* test/lisp/files-tests.el
(files-test-dir-locals-2-solo): New test.
* test/lisp/files-resources/dir-locals-2-solo: New test support.
(files-test-dir-locals-2-paired): New test.
* test/lisp/files-resources/dir-locals-and-2: New test support.

(cherry picked from commit 81c21d89ede8dfa664b7a3700acd7bf4c9fa54aa)

Avoid rare segfaults due to crazy creation of new child frames

* src/dispnew.c (combine_updates, combine_updates_for_frame): Skip
frames and child frames that were not yet completely made.
(Bug#77046)

(cherry picked from commit 62368f93a5d2cf1b961626c705c032e15b1d5f43)

Make isearch lazy-highlights non-sticky at both ends (bug#77121)

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

Remove ctags program

Remove our old ctags and suggest Universal Ctags instead.
This fixes a FIXME in lib-src/Makefile.in and speeds up compilation
quite a bit on my older CPU when I compile with --enable-gcc-warnings.
It also lessens installation and runtime footprint. (Bug#76322)
* .gitignore: Remove lib-src/ctags.
* admin/authors.el (authors-renamed-files-alist): Remove ctags.1.
* admin/check-man-pages: ctags.1 is no longer a special case.
* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove ctags.
* cross/Makefile.in (LIBSRC_BINARIES): Remove lib-src/ctags.
* doc/man/ctags.1, lib-src/ctags.c: Remove.
* java/Makefile.in (CROSS_LIBSRC_BINS): Remove ctags.
* lib-src/Makefile.in (INSTALLABLES): Remove ctags${EXEEXT}.
(ctags${EXEEXT}): Remove.
* lib-src/etags.c (CTAGS): Remove.  All uses replaced by ...
(ctags): ... this new static var.
(STDIN): Remove macro.  All uses replaced by new STDIN_OPTION constant.
(CTAGS_OPTION, STDIN_OPTION): New contants.
(longopts): New --ctags option.
(ctags_default_C_help): New constant,
to override default_C_help at runtime.
(default_C_help): Now always the etags version.
(C_LANG_NAMES_INDEX): New macro.
(print_language_names): Do not assume etags.
(PROGRAM_NAME): Remove.  All uses removed.
(print_help): Document --ctags if PRINT_UNDOCUMENTED_OPTIONS_HELP.
(main): Support new --ctags option, and support all [ce]tags options.
* test/manual/etags/Makefile (CTAGS_PROG):
Now etags --ctags, since there is no longer a ctags.

(cherry picked from commit 25d757535884da71ace29fd80b8b24dd3a8f9017)

; Another Tramp fix

* lisp/net/tramp.el (tramp-skeleton-file-truename):
Remove possible trailing slash.

(cherry picked from commit 2658f4eab96aaad7f52245c2422bbfa51db9b207)

Fix usage of string data pointers in xfaces.c

* src/xfaces.c (tty_defined_color): Don't use SSDATA pointers
across calls to Lisp.  (Bug#77046)

(cherry picked from commit 9816c61c4876ac2acdc6d9efb73c4270846b5555)

; Skip commit 1364bbc6a5cb8fd7816674c685bba8db7de8ada7

; Fix last change (bug#76980)

* lisp/window.el (window--state-normalize-buffer-name): Doc fix.

* doc/lispref/windows.texi (Window Configurations): Add indexing.

(cherry picked from commit 42e116bb1095f47cd0d57bbb6ee7b73d2d9f506e)

'window-state-normalize-buffer-name' option for `uniquify' buffers

If 'window-state-normalize-buffer-name' is non-nil, 'window-state-get'
will normalize stored buffer names, making them easier to restore for
users that use 'uniquify' buffer naming.
* doc/lispref/windows.texi (Window Configurations): Document
'window-state-normalize-buffer-name'.
* lisp/window.el (window-state-normalize-buffer-name): New defvar.
(window--state-normalize-buffer-name): New function.
(window--state-get-1): Call 'window--state-normalize-buffer-name'
rather than 'buffer-name'.
* etc/NEWS: Announce 'window-state-normalize-buffer-name'.
(Bug#76980)

(cherry picked from commit 4266514dc88345d5c1bc1ab6dd8576dd47caf57f)

; Skip commit 1aebb026112016fb38ff458bd50c80be0f139538

Delete now unused constants in nsterm.h

* src/nsterm.h (NS_DUMPGLYPH_NORMAL, NS_DUMPGLYPH_CURSOR)
(NS_DUMPGLYPH_FOREGROUND, NS_DUMPGLYPH_MOUSEFACE): Delete now unused
constants.

(cherry picked from commit 20687ab61715889cb0670c9351983154e6620c1b)

; Clean up comments in nsterm.h

(cherry picked from commit 69013ed73d8fd5e8827335c3e1be47dc652905a6)

; Fix recent documentation changes

* doc/lispref/frames.texi (Frames, Visibility of Frames):
* etc/NEWS: Fix wording, punctuation, and markup.

(cherry picked from commit d9386cb546571121899a6604badba651c2fa46da)

Improve 'C-u C-x =' for ligatures of ASCII characters

* lisp/composite.el (composition-find-pos-glyph): New function.
* lisp/descr-text.el (describe-char): Use it to get the font glyph
code of "trivial" compositions.
(describe-char-display): Accept an additional optional argument
and use it as the font glyph code for the character.

(cherry picked from commit 098fe4b73b62033b8930760e7fff0a23c271a1bb)

Tramp: Improve handling of cyclic symlinks

* lisp/net/tramp-sh.el (tramp-sh-handle-file-ownership-preserved-p):
Add FIXME.

* lisp/net/tramp.el (tramp-skeleton-file-exists-p)
(tramp-handle-file-directory-p): Protect against cyclic symlinks.

* test/lisp/net/tramp-tests.el (tramp-test18-file-attributes)
(tramp-test21-file-links): Adapt tests.

(cherry picked from commit 172e35afce430594fdf2eb9c404efc398098d621)

; Skip commit 049d7202f3f7f00f1536d2ed4de812636ec10640

Fix and document frame parameters for text terminals and child frames

* src/frame.c (Fmake_frame_invisible): In doc-string describe
effect on text terminals.  Set FRAME correctly when called with
nil value.  Make frame invisible before calling mru_rooted_frame
or next_frame.
(Ficonify_frame): Make it work for child frames on text
terminals
(Fmodify_frame_parameters): Make value 'icon' for 'visibility'
work for child frames.
* src/dispnew.c (frame_ancestors_visible_p): New function.
(frames_with_root): If VISIBLE_ONLY is non-nil, return only
frames whose ancestors are all visible to avoid that redisplay
draws visibly orphaned child frames.
* doc/lispref/frames.texi (Frames): Move descriptions of top
frame and 'tty-top-frame' here.
(Frame Layout): Mention that on text terminals the outer border
can be emulated by setting the 'undecorated' frame parameter.
(Frame Position, Frame Parameters, Window Frame Parameters)
(Position Parameters, Size Parameters): Rewrite sections dealing
with the handling of frame parameters in text terminals.
(Layout Parameters): Move description of 'undecorated' parameter
here.  Clarify semantics of 'menu-bar-lines' parameter.
(Frame Interaction Parameters): Move description of 'visibility'
parameter here.  Mention which parameters are not implemented on
text terminals.
(Mouse Dragging Parameters): Describe how these work on text
terminals.
(Visibility of Frames): Rewrite section.
(Raising and Lowering): Describe for text terminals.
(Child Frames): Fix description of 'iconify-child-frame' option.

(cherry picked from commit 1ee2a921ad528e18cc68c594f4f2ffcb0599cfe7)

; Add index entry "code completion" to user manual

* doc/emacs/programs.texi (Symbol Completion): Improve indexing by
adding "code completion".  This is the name that this feature goes by
elsewhere, so users are likely to look for it.

(cherry picked from commit dc80a8f0509e37cc92f4f2f3a18c6732b163ffd4)

; Update version comment in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el: Update comment for version
0.3.0 of tree-sitter-lua grammar.  (Bug#77158)

(cherry picked from commit cf7fdd374ac96ddd53a026bda2aa2b7211e5ee70)

; * doc/emacs/programs.texi (Program Modes): Add info about Eglot.

(cherry picked from commit 0d9b14ed05701104d251495cf80fe47627a3b0ee)

; Skip commit 0d654a10c90e8c2345a22384d503fbf340879ce7

Make 'eieio-version' obsolete

EIEIO used to be developed externally as part of CEDET, but that is no
longer the case.  It now has the same version as Emacs itself.
https://sourceforge.net/p/cedet/git/ci/8aa920380f8178ed2514f06f13c403d80db16752/

* lisp/emacs-lisp/eieio.el: Change "Version" header to "Old-Version".
(eieio-version): Make both the variable and the function obsolete in
favor of 'emacs-version'.

(cherry picked from commit 580c050f6dd41eea718f9414efeabcae43cdb625)

; Skip commit f224475f5784fe40521f066214913212c79dc429

xref: error -> user-error: reduce debug-on-error annoyance

* lisp/progmodes/xref.el (xref--next-error-function): Use user-error
instead of error.

(cherry picked from commit 2fcf6b40869f085b32876206179bf1dfe2dc2c93)

Adapt ediff to nonstandard layouts

Make ediff cope with having some of its windows (especially the control
window) not shown by a custom ediff-window-setup-function.
Modernize relevant adjacent code. After this change, one can write a
custom ediff-window-setup-function that doesn't show the control window.

* doc/misc/ediff.texi (Notes on Heavy-duty Customization): Refine
language to explain that the window setup function doesn't have to show
all windows.
* lisp/vc/ediff-util.el (ediff-select-control-window-on-setup):
New variable.
(ediff-setup, ediff-recenter, ediff-recenter-one-window)
(ediff-recenter-ancestor, ediff-toggle-read-only)
(ediff-operate-on-windows, ediff-jump-to-difference-at-point)
(ediff-default-suspend-function)
(ediff-clone-buffer-for-region-comparison)
(ediff-clone-buffer-for-window-comparison): Modernize control flow;
select only windows that exist.
* lisp/vc/ediff-wind.el (ediff-with-live-window): New convenience macro.
(ediff-window-setup-function): Explain relaxed contract.

(cherry picked from commit e5ee1d2a74c6a0989c863c3c6c06eba31efaecb3)

; Skip commit b21636580bed822bd9fb8bb84014311fa9b4c071

; Skip commit b12a3a03ae134ab710170b43262fe8db13364727

Avoid infinite loop with images under 'display-line-numbers-mode'

* src/xdisp.c (move_it_in_display_line_to, display_line): When
considering the first glyph on a glyph row, take into
consideration the glyphs produced for line-number display.
(Bug#77065)

(cherry picked from commit df6669578001e49f44714301df71870654a2de33)

Leave buffer with input-method help unmodified

* lisp/international/quail.el (quail-help): Leave "*Help*"
unmodified.  (Bug#77139)

(cherry picked from commit bbad5be9f05aee3eb38b81c65c4a3a286271ce55)

Make compilation-filter-hook into a defcustom

* lisp/progmodes/compile.el (compilation-filter-hook): Make variable
into a defcustom.

(cherry picked from commit 40a17ce3b238ea0223d1b3e1c72f48352e1ca63d)

; Skip commit f0800612e5c5835bd74459eab9dd8843ed9cdfd3

; Fix 'lua-ts-mode' tests (Bug#77102)

* test/lisp/progmodes/lua-ts-mode-resources/indent.erts:
Remove unintended use of tabs and make indentation settings
buffer local.

(cherry picked from commit 60e9195984d746cbbb5939918ed5ddc27377c0e6)

; Skip commit 22602f9c2ca2088fe42d2622eebdd9cd7a0d6b42

; Skip commit 77ad6518bb51410d0bb0199f55e9696265e3cf1d

Fix `string-pixel-width' with alternate text properties

Fix possible wrong result of `string-pixel-width' with alternate
and default properties.  Create new regression tests.
* lisp/emacs-lisp/subr-x.el (string-pixel-width): Like for
`face-remapping-alist', use in work buffer the value of
`char-property-alias-alist' and `default-text-properties'
local to the passed buffer, to correctly compute pixel width.
(Bug#77042)

* test/lisp/misc-tests.el: Add tests for `string-pixel-width'.

(cherry picked from commit b1db48c0fcd438c903826fe0dba3bc28ffa73cc4)

MariaDB and Mysql handle escaped aphostrophes in the same way

* lisp/progmodes/sql.el (sql-mode): MariaDB and Mysql both
handle escaped apostrophes in the same way.  (Bug#77088)

(cherry picked from commit cace07f27dc31091a606a70ae8b957cd5dd7da43)

Fix OSX build without pdumper

* Makefile.in (install-arch-dep) [ns_self_contained]: Add missing
DUMPING = pdumper check.

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

; Add indexing for Eglot in user manual

* doc/emacs/programs.texi (Imenu, Programming Language Doc)
(Symbol Completion):
* doc/emacs/maintaining.texi (Xref): Index Eglot-related
functionalities.

(cherry picked from commit 2d12754ee20deb789bd5444f604acda6bb05bbf9)

; Change some instances of cl to cl-lib in docs

* doc/misc/cl.texi (Overview):
* doc/misc/eieio.texi (CLOS compatibility, Wish List): Change 'cl' to
'cl-lib' where appropriate.

(cherry picked from commit a30b9b640b46c23f0a6db7b8fbe329d93e035db6)

; Improve introduction to use-package manual

* doc/misc/use-package.texi (Top): Improve introduction.

(cherry picked from commit b681d62436f577ddfbfbac50885d48cde320632e)

; Add cross-references to push and pop docstrings

* lisp/subr.el (push, pop): Add cross-references to Info manual.

(cherry picked from commit f1acefd86f8d88d26455fec43961d3060451b6f0)

Improve 'gui-get-selection' on MS-Windows

* lisp/term/w32-win.el (w32--get-selection): Allow UTF8_STRING and
TEXT data types as well, since w32select.c handles that correctly.

(cherry picked from commit e53b90a5ce21feeb0290fbe035e9a2d6aae34bc3)

; * etc/symbol-releases.eld: Add time-stamp, from my notes

(cherry picked from commit a7d2aa7e0c1a0984d6d1a3563b407efda123d6ae)

; * java/org/gnu/emacs/EmacsInputConnection.java: Fix commentary typo.

(cherry picked from commit f38f4588d7bb5dee9f6a5adc1b29bd457c70c7b2)

Recenter calendar-chinese-year-cache on 2028

* lisp/calendar/cal-china.el (calendar-chinese-year-cache): Recenter
on 2028.

(cherry picked from commit 3488ae7c5295bb2385d65f1e7e470bd727f6b408)

; Improve documentation of incf and decf

* doc/lispref/variables.texi (Setting Generalized Variables): Mention
incf and decf.
* lisp/emacs-lisp/gv.el (incf, decf): Add references to Info manual
documentation on generalized variables.

(cherry picked from commit 03053baebee8a89f1b1d470a6173b9f1e80f0b39)

; Delete duplicate variable definition

* lisp/doc-view.el (doc-view--current-cache-dir): Delete duplicate
variable definition.

(cherry picked from commit 1fca171addd830fab78fb7cc1c73c43cd7d7a2e9)

indent.erts (Code): Don't modify the global state

* test/lisp/progmodes/java-ts-mode-resources/indent.erts (Code):
Use `setq-local` and correspondingly move the remaining
assignment after activating the major mode.

(cherry picked from commit 5432331a62522c096246ef995a5b41dc067d25a9)

; Skip commit beeece4712c464a6eb62c8e9b72c6f7515614f6c

* lisp/files.el (save-some-buffers-action-alist): Fix 'view-mode'.

Use 'view-mode-enter' instead of 'view-buffer' to ignore the 'special'
mode-class that prevents some modes from binding 'q' to 'exit-action'
that should call 'exit-recursive-edit' (bug#76745).

(cherry picked from commit 7016d1c8e3c16e8bfb61ce8ef96d85490a00c2eb)

; Avoid scraping non-readable files for maintainers

* lisp/mail/emacsbug.el (submit-emacs-patch): Check if a file
mentioned in a patch can be opened.  (Bug#77083)

(cherry picked from commit a77f10305c9ad0354987b09ec9a967021bb47d93)

; Skip commit cf5aaae90bd3961171e9edef6ee1f97b98c266a6

; Tramp: fixes resulting from test campaign

* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
Handle symlinks.

* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file):
STDERR is not implemented.

* lisp/net/tramp.el (tramp-skeleton-process-file): Raise a warning
if STDERR is not implemented.
(tramp-handle-shell-command):
Respect `async-shell-command-display-buffer'.

* test/lisp/net/tramp-tests.el (tramp-test28-process-file): Adapt test.

(cherry picked from commit f6632114fe661930c45b5e9c1bf66644be095ff9)

On tty frames restrict number of menu bar lines (Bug#77015)

* src/frame.c (set_menu_bar_lines): Make sure tty frames get
only 0 or 1 menu bar line (Bug#77015).

(cherry picked from commit fa1cfcada0939e33d69696df6448b75b33ab656d)

; Minor keymap cleanup in dired.el

* lisp/dired.el:
(dired-context-menu): Prefer keymap-set.
(dired-click-to-select-map): Move key definition inside defvar-keymap.

(cherry picked from commit ec9290eb80253cc97990788aab588a15cb35b664)

lisp/emacs-lisp/smie.el (smie-config-show-indent): Tweak message

(cherry picked from commit 0e1f81b9bc469c7b115d1abcd12c20aae4160dd7)

Ensure redisplay after re-parenting a tty child frame (Bug#77079)

* src/frame.c (store_frame_param): When re-parenting a tty child
frame, mark it's old and new root frames as garbaged so redisplay
will reflect the change immediately (Bug#77079).

(cherry picked from commit 739d18dc41234824f4f01bfaa2313510e2df14a7)

Fix generation of mouse position lists on the tool and tab bars

* src/keyboard.c (make_lispy_tty_position): Return whether an
internal border was hit.
(make_lispy_position): Only skip standard window and frame
detection process if so, as there are other scenarios where POSN
is nil but WINDOW_OR_FRAME is none the less expected to be
provided by the conditionals skipped.

(cherry picked from commit 5a4b9ca7364f225eff9b134ff06a49c46179366e)

; Use defvar-keymap in define-derived-mode

* lisp/emacs-lisp/derived.el (define-derived-mode): Use defvar-keymap.
This change is for documentation purposes on macro expansion.

(cherry picked from commit 5f4c9053538fc1bf472c1be9a203db5c6178ea02)

Use 'help-key' function in more places

* lisp/dired-aux.el (dired-query):
* lisp/emacs-lisp/helper.el (Helper-help-map):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use 'help-key'.
* lisp/net/tramp-cmds.el (tramp-rename-files):
* lisp/which-key.el (which-key--next-page-hint): Prefer 'help-key'
when available.
* lisp/help.el (help-key): Simplify.
* etc/symbol-releases.eld: Add 'help-key'.

(cherry picked from commit 69210eb84e7c3074c339b8aa2f380f66a80ae61b)

; * lisp/follow.el (follow-mode-prefix-key): Improve.

(cherry picked from commit 49e019fbbc61e22167f0a15a3b1983d98bce7be6)