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

; Fix 'java-ts-mode' tests (Bug#77070)

* test/lisp/progmodes/java-ts-mode-resources/indent.erts:
Set 'indent-tabs-mode' later.

(cherry picked from commit be2b5a7148887879e0127994c9d779a943e3df2b)

; * src/dispnew.c (adjust_glyph_matrix): Restore lost comment.

(cherry picked from commit 4cfeb3697c242b5d669a102bd43fa51f776f987e)

; * src/dispnew.c (adjust_glyph_matrix): Add comment (bug#77039).

(cherry picked from commit 4008e664a8dc6d92dda0ba0a5b0c717ab3f72e5c)

; Skip commit c44f34475af6b1e32c71a230e25e0cbea0697c4c

; * etc/NEWS: Fix last change.

(cherry picked from commit fd88c5232098a323f6334b6e1f7e2dacdc447a8e)

Make marking conflicted files as resolved upon saving opt-out

This fixes Bug#3860.

* lisp/vc/vc.el (vc-resolve-conflicts): New user option.
* lisp/vc/vc-bzr.el (vc-bzr-resolve-conflicts): New user option.
(vc-bzr-find-file-hook): Use it.
* lisp/vc/vc-hg.el (vc-hg-resolve-conflicts): New user option.
(vc-hg-find-file-hook): Use it.
* lisp/vc/vc-svn.el (vc-svn-resolve-conflicts): New user option.
(vc-svn-find-file-hook): Use it.
* lisp/vc/vc-git.el (vc-git-resolve-conflicts): Support
'default' as an option.  Adjust docstring and version.
(vc-git-find-file-hook): Respect vc-resolve-conflicts.
* etc/NEWS: Announce the new options.

(cherry picked from commit acb96a5ca8ac3bef80ca2ff1496cacb3ab57c87a)

Implement dragging and resizing of tty child frames

* lisp/faces.el (face-spec-recalc): Don't set
scroll-bar-foreground and scroll-bar-background parameters on
ttys.
* lisp/mouse.el (mouse-drag-frame-resize)
(mouse-drag-frame-move): On ttys call
'mouse-position-in-root-frame' to get position of child frame to
resize or drag.
* lisp/xt-mouse.el (xterm-mouse-event): Handle events on
child frame decorations as if they happened on the internal border
to find out whether a user wants to drag or resize a child frame.
* src/frame.c (frame_internal_border_part): Define for ttys too.
(Fmouse_position_in_root_frame): New function.
* src/frame.h (internal_border_part): Define for ttys too.
* src/keyboard.c (internal_border_parts): Define for ttys too.
(frame_border_side): New enum.
(make_lispy_position): Handle events on tty child frames.
(Fposn_at_x_y): Accept -1 for Y so we can handle a position on
the top decoration of a tty child frame.
* src/term.c (tty_frame_at): Handle case where X and Y denote a
position on a tty child frame's decoration.
* src/window.c (Fwindow_at): Handle case where X and Y denote a
position on the decoration of a tty child frame which we pretend
as belonging to that child frame (and not to its root).

(cherry picked from commit 86be9431ae88126387ed8402cb4953963ebba6f8)

Implement surrogate menu bars for tty child frames

* lisp/menu-bar.el (popup-menu): When asked to pop up MENU from
a tty child frame try to use menu of its root frame.
(menu-bar-open): When FRAME is a child frame and
'tty-menu-open-use-tmm' is nil, navigate menu bar of its root
frame.
* src/keymap.c (Fcurrent_active_maps): Accept live window as
POSITION argument and use its buffer as current when processing
the key sequence.  Needed for tty child frames so the root
frame's menu bar can be updated according to the selected
window's buffer when navigating the menu bar from keyboard.
* src/xdisp.c (prepare_menu_bars): If the selected window's
frame is a tty child frame without menu bar, that frame's root
frame has a menu bar and 'tty-menu-open-use-tmm' is nil, prepare
to update the menu bar of the root frame as surrogate.
(update_menu_bar): New argument W denoting the window that
should be considered as selected.  For a tty child frame using F
as surrogate menu bar frame this specifies the child frame's
selected window and its buffer shall be used for updating the
menu bar of the root frame instead of the buffer of the root
frame's selected window.
(redisplay_window): Instead of setting redisplay_menu_p flag
always call display_menu_bar right away.  This facilitates to
call display_menu_bar for a tty child frame with its root
frame as surrogate menu bar frame.
(display_tty_menu_item): If the selected frame is a tty child
frame, overwrite its root frame's glyph matrix (and not that of
the child frame) when displaying a menu item.
(Qtty_menu_open_use_tmm): Define symbol.

(cherry picked from commit 7e71b0a2c938623872ec7404d81339c8ff51b012)

; Skip commit d708ebe401a2001e764821b7e43d9e9aaa23ea95

Add some keywords to java-ts-mode--keywords (bug#75154)

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode--keywords): Add keywords, remove @interface.

(cherry picked from commit eb63d0c04a6747a8a1847b88a50befb4e425e7a3)

Move around java-ts-mode font-lock rules (bug#75154)

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode--font-lock-settings): Move constant feature down
so it overrides expression and definition.

(cherry picked from commit 3d2d95e28431a16897a65543d8b26c791b389ef6)

Use c-ts-common baseline rule in java-ts-mode (bug#75154)

Use it for function parameters.

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode--standalone-predicate): New function.
(java-ts-mode--indent-rules): Comment out rules for function
parameters and statements, and add
c-ts-common-baseline-indent-rule as fallback.
(java-ts-mode): Setup.
(java-ts-mode--first-line-on-multi-line-string): Mark BOL as
unused.
* test/lisp/progmodes/java-ts-mode-resources/indent.erts:
New test.

(cherry picked from commit 93cd55f40e5e1788e55d82c572f1fafac1dee499)

Add indentation for multi-line string in java-ts-mode (bug#75154)

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode--first-line-on-multi-line-string): New function.
(java-ts-mode--indent-rules): Add rules.

(cherry picked from commit affb2ba77b4a7ec7c000b18cc5c30d237e1b7165)

Add java-ts-mode-method-chaining-indent-offset (bug#75154)

Default method chaining to indent 8 spaces.

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode-method-chaining-indent-offset): New custom option.
(java-ts-mode--indent-rules): Use
java-ts-mode-method-chaining-indent-offset.

(cherry picked from commit 8fb31f58664b2c963dcc49706c163ffb4fafd699)

; Skip commit d7763c45138865e81895cc2196602ab1893af5af

Make sure to initialize glyph::frame to NULL (bug#77039)

* src/dispnew.c (adjust_glyph_matrix): Clear glyph memory when
enlarging window-system window glyph matrices.

(cherry picked from commit eab14d68b2e72b9a6b8b0cc67c9667c2bfbed4f5)

Correctly unload variable aliases.

* src/eval.c (Finternal_delete_indirect_variable): Add function.
* lisp/loadhist.el (loadhist-unload-element): Use it for variable
aliases.
* test/src/eval-tests.el (eval-tests--internal-delete-indirect-variable):
Test function `internal-delete-indirect-variable'.
* test/lisp/loadhist-tests.el (loadhist-test-unload-feature-alias):
* test/lisp/loadhist-resources/loadhist--alias.el: Test unloading of
features that define variable aliases.  (Bug#76748)

(cherry picked from commit 7f2e4508cebe76a885b72ca4789ae839d5bd45e1)

Tramp: Handle symlinks to non-existing targets better

* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
Don't use the truename.

* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file): Refactor.  Handle
symlinks.  (Bug#76678)

* lisp/net/tramp-smb.el (tramp-smb-errors): Add string.
(tramp-smb-handle-copy-file, tramp-smb-handle-rename-file):
Refactor.

* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
Don't use the truename.  Handle symlinks.

* lisp/net/tramp.el (tramp-barf-if-file-missing): Accept also symlinks.
(tramp-skeleton-file-exists-p): Handle non-existing symlink targets.
(tramp-skeleton-set-file-modes-times-uid-gid): Fix typo.

* test/lisp/net/tramp-tests.el (vc-handled-backends):
Suppress only if noninteractive.
(tramp-test11-copy-file, tramp-test12-rename-file)
(tramp-test18-file-attributes, tramp-test21-file-links)
(tramp--test-check-files): Adapt tests.

(cherry picked from commit b8104dadbf285d12c356d4cddd28ac3eaf05f263)

Don't recommend legacy keymap functions in docstrings

* lisp/comint.el (comint-prompt-read-only):
* lisp/ielm.el (ielm-prompt-read-only):
* lisp/international/ogonek.el (ogonek-informacja, ogonek-information):
* lisp/mouse-copy.el (mouse-drag-secondary-pasting):
* lisp/mouse-drag.el (mouse-drag-throw, mouse-drag-drag): Don't
recommend using legacy keymap functions.

(cherry picked from commit 03e33cbef3e33aa1ec843388d1671f7116a7347b)

Use substitute-quotes for checkdoc errors

* lisp/emacs-lisp/checkdoc.el (checkdoc-create-error): Use
substitute-quotes.

(cherry picked from commit dec21bcc9997780a9c56e4eb7f718fd64d8c32ec)

; Update lisp/ldefs-boot.el

Simplify tempo.el a bit and use it in refactor.el

Drop snmp-mode.el

Bump electric-pair-mode definition up a bit

Fix 'lisp-kill-line' with point before comment

Use defvar-keymap for some trivial keymaps

* lisp/bindings.el (mode-line-window-dedicated-keymap)
(mode-line-buffer-identification-keymap):
* lisp/emulation/cua-rect.el (cua--overlay-keymap, cua--overlay-key):
* lisp/mh-e/mh-mime.el (mh-mime-security-button-map):
* lisp/mh-e/mh-utils.el (mh-hidden-header-keymap):
* lisp/net/eudc-bob.el (eudc-bob-generic-keymap, eudc-bob-image-keymap)
(eudc-bob-sound-keymap, eudc-bob-url-keymap, eudc-bob-mail-keymap):
* lisp/progmodes/etags-regen.el (etags-regen-mode-map):
* lisp/progmodes/octave.el (octave-help-mode-map):
* lisp/replace.el (multi-query-replace-map):
* lisp/simple.el (process-menu-mode-map, messages-buffer-mode-map):
* lisp/startup.el (splash-screen-keymap):
* lisp/tab-bar.el (tab-bar-mode-map):
* lisp/textmodes/ispell.el (ispell-minor-keymap):
* lisp/textmodes/tex-mode.el (latex-mode-map, plain-tex-mode-map):
* lisp/tree-widget.el (tree-widget-button-keymap):
* lisp/vc/vc-hooks.el (vc-mode-line-map): Use defvar-keymap.

(cherry picked from commit d8d524071d78d6499278546cf13ae261c05cadf3)

; New `bisect' argument to `ats-execute-tests-batch'

* test/infra/android/test-controller.el
(ats-execute-tests-batch): New argument `bisect'.

(cherry picked from commit 5d02ca181daa2b3833a2b32157388a7b131955e8)

Fix clipboard object handle leak on Android 3.1 to 11.0

* src/androidselect.c (extract_fd_offsets): Release retrieved
ParcelFileDescriptor objects on APIs 12 through 30.

(cherry picked from commit 2d5cf228186184b5af6e4e8ee8f5280f67f407bc)

Avoid rare segfaults in 'combine_updates_for_frame'

* src/xdisp.c (redisplay_internal): Don't add to 'tty_root_frames'
frames that are not yet completely made.  (Bug#77046)

(cherry picked from commit 412a6fad98e768000dfe9538179889d6faeaa97a)

Only disable 'completion-preview-active-mode' when it is on

* lisp/completion-preview.el
(completion-preview--post-command): Avoid calling
'completion-preview-active-mode' to disable the mode when
already off, since it forces a costly redisplay. (Bug#76964)

(cherry picked from commit b6b4a080a3abb5a45b680e26f93dd17adbb75f69)

New project-save-some-buffers command

* lisp/progmodes/project.el (project-save-some-buffers): New command.
(project-prefix-map): Bind it to C-x p C-x s.
* etc/NEWS: Announce the new command and binding.

(cherry picked from commit db0bed7a68cd2308eba61247a6a77f73533ffef6)

vc-revert: Offer to save modified buffers (bug#55310)

* lisp/vc/vc.el (vc-revert): Offer to save modified buffers that
otherwise prevent proceeding with the revert (bug#55310).

(cherry picked from commit 6f483ffdc217ea9f8dc079b2344f771214222273)

; Skip commit f5f3fb7dd4e7d0c1fa235309d29d8d1c9432c277

; Skip commit 91a9d021999d78109b01bad21d3439bc2e2875cd

Update to Transient v0.8.6-7-g64cb8404

(cherry picked from commit f12ea5b703b88f0a877013bffff37a99c86143c7)

; Doc fix for legacy keymap functions

* doc/lispref/keymaps.texi (Low-Level Key Binding): Add new alternatives
for two more legacy functions.

(cherry picked from commit dcf3916e558d974aef6516e5709379fa3c762832)

; Skip commit 227db70db984091dc2ba9e1d860ce5354d729f7f

Add the treesit 'list' thing to csharp/go/php/rust-ts-mode (bug#73404)

* lisp/progmodes/csharp-mode.el (csharp-ts-mode): Add the
'list' and 'sentence' things to 'treesit-thing-settings'.
Set 'treesit-outline-predicate'.

* lisp/progmodes/go-ts-mode.el (go-ts-mode):
Add 'treesit-thing-settings' with the 'list' and 'sentence' things.

* lisp/progmodes/php-ts-mode.el (php-ts-mode):
Add the 'list' thing to 'treesit-thing-settings'.

* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
Add 'treesit-thing-settings' with the 'list' thing.

(cherry picked from commit f3925732bc55be3d6d32d20b95f7a88926d4ebda)

Simplify skeleton.el and tempo.el a bit

Drop dcl-mode.el

; * lisp/winner.el (winner--set-dont-bind-my-keys): Fix typo.

(cherry picked from commit 4f4105e6227cdb00109efb683d96beb47fd894c4)

; Skip commit 3860562a715b8ba7b727f7831e06ce5a0e676784

Improve conversion between half-width and full-width characters

* lisp/textmodes/text-mode.el (text-mode--get-fullwidth-table):
Add conversion of SPC to IDEOGRAPHIC SPACE.  (Bug#71822)

(cherry picked from commit ea49eb4752a0632d8d0dfd4215821ab21bbd5a99)

; Minor Tramp changes

* doc/misc/tramp.texi (Top): Add Key Index to menu.
(Key Index): New node.

* lisp/net/tramp-cmds.el (tramp-dired-buffer-command-completion-p):
New defun.
(tramp-dired-find-file-with-sudo): Add property
`completion-predicate'.

(cherry picked from commit 4b8b7bb5cfc27b88fdf892a87931f5b89ff8c4a3)

Fix 'whitespace-mode' in CJK locales

* lisp/international/characters.el (ambiguous-width-chars): Remove
U+00A4 and U+00B7 from the list of ambiguous-width characters.
(cjk-ambiguous-chars-are-wide): Doc fix.  (Bug#76852)

(cherry picked from commit 1a8fbf69e3378996e633cf299b6a2d0716722d86)

; Touch up tramp-*-with-sudo documentation, add FIXMEs

* doc/emacs/dired.texi (Dired Visiting):
* doc/emacs/files.texi (Reverting):
* doc/misc/tramp.texi (Ad-hoc multi-hops):
* etc/NEWS:
* lisp/net/tramp-cmds.el (tramp-revert-buffer-with-sudo)
(tramp-dired-find-file-with-sudo): Touch up documentation of
these features.  Add FIXMEs about renaming the two commands.

(cherry picked from commit a57e9f45db6007bdb4af21a444f0ed62d1b2010e)

; * lisp/so-long.el: Documentation

(cherry picked from commit 87f9c09ab5fbfa9652aabe2799df654456d5e04c)

; * lisp/so-long.el: Backwards-compatibility fix for Emacs < 30

We support Emacs 24.4 and later (for ELPA releases), so revert the
change from commit 7705bdfa5b89f78dab049f73f636b9680a3c12bc

(cherry picked from commit 25eabcde0d6ec7d8c161c2e05a5600b1c22fa43d)

; * lisp/so-long.el: Backwards-compatibility fix for Emacs < 27

We support Emacs 24.4 and later (for ELPA releases), and ad-find-advice
only changed from a macro to a function in Emacs 27, so this change is
to restore compatibility with older versions where we do need the macro
definition loaded at byte-compilation time.

This effectively combines the related changes from:

- commit 986c12b20fa29c37f13563846fddf6edcd0b4945
- commit c221db0402031c23b983eea3a6bc129e5abb98f6

(cherry picked from commit 03a6d5a76331e814368f17a61718208242e44bee)

; Improve documentation of 'gui-get-selection' use on X

* doc/lispref/frames.texi (Window System Selections):
* lisp/select.el (gui-get-selection): Suggest to use an explicit
DATA-TYPE when calling 'gui-get-selection'.

(cherry picked from commit 01c03043e6e93dd12570a960ca54108d543578db)

* lisp/bindings.el (tramp-revert-buffer-with-sudo): Declare.

(cherry picked from commit 5d1b696e9953f69ad918af094e5d09562a4deeaf)

; Fix last change (bug#76789)

* doc/misc/speedbar.texi (Frames Windows and Faces): Fix node
name.  Fix markup and punctuation.
(Introduction): Fix markup.

(cherry picked from commit f69cc74c897b2e9c3eb0ad9a140743ad4d69a019)

Add a new command `speedbar-window'.

Speedbar now can be opened in a window instead of a separate frame. The
frame remains the default.

* doc/emacs/frames.texi: Mention Speedbar window mode.
* doc/misc/speedbar.texi: Document 'speedbar-window'.
* lisp/speedbar.el
(speedbar-prefer-window): New user option. If t, the command `speedbar'
open the speedbar in a window.
(speedbar-window-dedicated-window): New user option. If t the window is
dedicated.
(speedbar-window-side):  New user option. The side of 'speedbar-window',
defaults to left.
(speedbar-window-default-width): New user option. The default size of
the 'speedbar-window'.
(speedbar-window-max-width): New user option. Limits the width of the
'speedbar-window'. The user can resize the window as desired, but this
option will be the width of the window when restored.
(speedbar--buffer-name): New variable, the buffer name used for both
'speedbar-frame-mode' and 'speedbar-window-mode'.
(speedbar--window): New variable, the window displaying 'speedbar-window'.
(speedbar--window-width): New variable, store the current width of
'speedbar-window'.
(speedbar-easymenu-definition-trailer): Now it is a function that
returns a different trailer for 'speedbar-frame' and 'speedbar-window'.
(speedbar): Now it is a function that calls 'speedbar-frame-mode', the
default or 'speedbar-window-mode' based on the value of
'speedbar-prefer-window'.
(speedbar-frame-mode): Before opening a frame, close 'speedbar-window'
if it is open.
(speedbar-frame-or-window): New function, returns 'frame', 'window'
or nil if speedbar is not open.
(speedbar-window): New alias for 'speedbar-window-mode'.
(speedbar-window-mode): Enable of disable 'speedbar-window'.
(speedbar-window--window-live-p): New function, return non-nil if the
'speedbar-window' is live.
(speedbar-window--buffer-live-p): New function, return non-nil if the
'speedbar-buffer' is live.
(speedbar-window--live-p): New function, return t if 'speedbar-window'
is open.
(speedbar-window-current-window): New function, return t if the selected
window is speedbar-window.
(speedbar-window--close): New function, close the 'speedbar-window'.
(speedbar-window--width): New function, return the current width of
'speedbar-window'.
(speedbar-width): New function, return the 'speedbar' of
'speedbar-frame-mode' of 'speedbar-frame-mode'.
(speedbar-set-mode-line-format): Use the new 'speedbar-width' function.
(speedbar-directory-buttons): Use the new 'speedbar-width' function.
(speedbar--speedbar-live-p): New function, returns t if
'speedbar-frame-mode' or 'speedbar-window-mode' are open.
(speedbar-timer-fn): Now handle 'speedbar-frame-mode' and
'speedbar-window-mode'.

(cherry picked from commit c1aab8c49b763abc482a6dbc402782bbe5370da0)

; * doc/lispref/commands.texi (Click Events): Fix a thinko.

(cherry picked from commit c8471129dd6e576aaf2dfdc65e09fcf297d1ff3c)

; Skip commit 66ec9ae71959fd562646c8c3b482aff7f41adc50

; Fix documentation of recent change in mouse.el

* lisp/mouse.el (mouse-event-areas-with-no-buffer-positions): Doc
fix.
(mouse-posn-property): Add commentary.

(cherry picked from commit 82e44e86754427864305fcc2e03a52a54a1cae2f)

; Fix documentation of mouse-click events

* doc/lispref/commands.texi (Click Events): Add menu-bar events to
the description.  Add missing details about tab-bar click events.

(cherry picked from commit 6e28c2019e772aa19040cf17e314fcee23bb33d4)

; * lisp/dired.el (project-root): Declare.

(cherry picked from commit e09cb3aee9a7dfb851d0470f30bd71426c3434bf)

Fix mouse-posn-property

* doc/lispref/commands.texi (Click Events): Mention menu-bar.
* lisp/mouse.el (mouse-event-areas-with-no-buffer-positions):
New defvar including all areas mentioned in the Lisp reference.
(mouse-posn-property): Use it.

(cherry picked from commit b105089715c8b5d467282513965035faf955a5e3)

; * src/w32.c (term_ntproc): Fix capitalization of commentary.

(cherry picked from commit 88e30e1ac5a154d9828954f8052e1a04aed15999)

; Fix punctuation and typos in w32proc.c

* src/w32proc.c (WFO_MAX_WAIT, wait_objects_context)
(start_wait_objects, stop_wait_objects, end_wait_and_return)
(shrink_wait_pool, free_wait_pool, wait_for_objects)
(msg_wait_for_objects, delete_child, WINAPI, create_child)
(waitpid): Repunctuate sentences and correct typos.

(cherry picked from commit 1749ad825e2d7bd456665ce02fb7faf79a6e9143)

Delete pre-Emacs 20 documentation from term.el

* lisp/term.el: Delete comment titled "Converting process modes to use
term mode".  This comment from 1994 is only of historical interest.

(cherry picked from commit aa66edeeba508bf5be89a5257216a5d995e47d89)

; * etc/symbol-releases.eld: Add current-global-map.

This avoids saying that it was introduced in Emacs 29.1.

(cherry picked from commit 3864b9352a01804af2e4b43a6bc171953375cdf7)

Recommend using 'keymap-set' in Commentaries

* lisp/calendar/timeclock.el, lisp/comint.el, lisp/ehelp.el:
* lisp/gnus/gnus-bookmark.el, lisp/gnus/smiley.el, lisp/ido.el:
* lisp/isearchb.el, lisp/mail/mailabbrev.el, lisp/net/ange-ftp.el:
* lisp/net/goto-addr.el, lisp/play/fortune.el, lisp/saveplace.el:
* lisp/shell.el, lisp/term.el, lisp/textmodes/makeinfo.el:
* lisp/textmodes/refer.el, lisp/textmodes/remember.el:
* lisp/textmodes/table.el, lisp/woman.el: Recommend using
'keymap-set' instead of 'define-key' in Commentaries.

(cherry picked from commit ecd756dd391c1436820593e240f1f7b8a28b2c6e)

Recommend using 'keymap-global-set' in Commentaries

* lisp/bs.el, lisp/calculator.el, lisp/cedet/data-debug.el:
* lisp/help-at-pt.el, lisp/hilit-chg.el, lisp/mail/mspools.el:
* lisp/mh-e/mh-e.el, lisp/mouse-copy.el, lisp/mouse-drag.el:
* lisp/net/browse-url.el, lisp/net/webjump.el, lisp/printing.el:
* lisp/progmodes/cfengine.el, lisp/progmodes/ebnf2ps.el:
* lisp/ps-print.el, lisp/repeat.el, lisp/term/wyse50.el:
* lisp/term/x-win.el, lisp/vcursor.el, lisp/woman.el:
Recommend using 'keymap-global-set' instead of 'global-set-key'.

(cherry picked from commit 679ad95a67fbecafd203c9e7f55547a312b3833b)

Use defvar-keymap in which-func.el

* lisp/progmodes/which-func.el (which-func-keymap): Use defvar-keymap.
(which-func-maxout): Change :type to natnum.
(which-func-format): Use substitute-command-keys.

(cherry picked from commit 2009ae85935beb345ce605abe398dbbe6cd84b9b)

Add :set attribute to winner-dont-bind-my-keys

* lisp/winner.el (winner--set-dont-bind-my-keys): New function.
(winner-dont-bind-my-keys): Allow setting with setopt.
(winner-mode-map): Use defvar-keymap.
* test/lisp/winner-tests.el: New file.

(cherry picked from commit 33cc5427cbec224d55fac9d76b7c2978fdd5034b)

Use defvar-keymap for command-history-mode-map

* lisp/chistory.el (command-history-mode-map): Use defvar-keymap.

(cherry picked from commit 6b295347a9f7491ae4c16d942b3b12a54fc2373a)

; Skip commit c29be6a2ecdf3b3746b5dccbd195dafb08b8b2d7

dired-copy-filename-as-kill: Support project-relative names

* lisp/dired.el (dired-copy-filename-as-kill): Support new value
of ARG, to mean file name relative to project root (bug#76792).

* doc/emacs/dired.texi (Misc Dired Features): Mention it.

* etc/NEWS: Same.

(cherry picked from commit af81b3af4ce99c664b040313b548910770bc5854)

Teach diff-apply-hunk to handle hunks with empty context

* lisp/vc/diff-mode.el (diff-find-source-location):
Consider the case when there is no diff context above or below
edited lines.  (bug#72556)

* test/lisp/vc/diff-mode-tests.el: Add tests for undoing hunks
from diffs with addtions only in the beginning or end of the
source file.

(cherry picked from commit 4980287e081d3efd29f64973938ca2a0575f521e)

; Skip commit af5a75a0bdd891686c67648bc0fa09ffb7e3ed0d

Make turn-on-flyspell/turn-off-flyspell obsolete

* lisp/textmodes/flyspell.el (turn-on-flyspell): Make into obsolete
function alias for 'flyspell-mode'.
(turn-off-flyspell): Declare obsolete.
(text-mode-hook): Don't redundantly set :options here.
* lisp/textmodes/text-mode.el (text-mode-hook): Prefer 'flyspell-mode'
to 'turn-on-flyspell' in :options.  (Bug#76535)

(cherry picked from commit bad2cd198abbd150cc205aee7879ad718e724dad)

Improve tramp-*-with-sudo commands

* doc/emacs/dired.texi (Dired Visiting):
Add tramp-dired-find-file-with-sudo.

* doc/emacs/files.texi (Reverting):
Add tramp-revert-buffer-with-sudo.

* doc/misc/tramp.texi (Ad-hoc multi-hops): Extend wrt
`tramp-*-with-sudo' commands.

* etc/NEWS: Add tramp-dired-find-file-with-sudo.
Fix typos.

* lisp/bindings.el (ctl-x-x-map):
* lisp/dired.el (dired-mode-map): Add "@" binding.  (Bug#76974)

* lisp/net/tramp-cmds.el (dired-get-file-for-visit): Declare.
(with-tramp-file-name-with-method): New macro.
(tramp-revert-buffer-with-sudo): Autoload.  Preserve position.
Use `with-tramp-file-name-with-method'.
(tramp-dired-find-file-with-sudo): New command.

(cherry picked from commit 24ffcbb3da9a010cf564bb496af3f5ce0b805f17)

; Skip commit 21371aa106e6924377e916237d8418bfff2a754c

; * src/w32.h (free_wait_pool): Move prototype from w32.c.

(cherry picked from commit c87f0e8a199826f1d05d5c1ff9722577b5fc70de)