New variable 'expose-hidden-buffer' (Bug#75828)

* src/frame.c (make_frame): Handle 'expose-hidden-buffer'.
(expose-hidden-buffer): New variable to handle hidden buffers.
* src/buffer.c (Fother_buffer): Mention that it does not return
a hidden buffer.
* lisp/frame.el (make-frame): In doc-string describe handling
of hidden buffers.
* doc/lispref/frames.texi (Creating Frames): Explain handling
of hidden buffers in description of 'make-frame'.

(cherry picked from commit 7f01dd8906cbc8839ffecc55cfa7ff789f3fa298)

; * admin/MAINTAINERS: Remove Bastien Guerry.

(cherry picked from commit c400ac680f4db86686126876e2d709b1e6099544)

Eglot: allow customizing the mode line (bug#71823)

* lisp/progmodes/eglot.el (eglot-code-action-indications): Adjust docstring.
(eglot--mode-line-props): Tweak.
(eglot--mode-line-format): Delete.
(eglot-mode-line-format): New defcustom.
(eglot-mode-line-menu, eglot-mode-line-session)
(eglot-mode-line-error, eglot-mode-line-pending-requests)
(eglot-mode-line-progress, eglot-mode-line-action-suggestion): New
constants.
(mode-line-misc-info): Adjust setting

* etc/EGLOT-NEWS: Mention new feature.

* doc/misc/eglot.texi (Customization Variables): Mention new variable.

(cherry picked from commit b4e9115f4fcfc174a9c3b974bf414ae4af060ae7)

Eglot: suggest code actions at point

* lisp/progmodes/eglot.el (eglot-code-action-indicator-face): New face.
(eglot-code-action-indications, eglot-code-action-indicator): New defcustoms.
(eglot--highlights): Move up here.
(eglot--managed-mode): Rework.
(eglot--server-menu-map, eglot--main-menu-map): Extract maps into
variables (avoids odd mode-line bug).
(eglot--mode-line-format): Rework.
(eglot--code-action-params): New helper.
(eglot-code-actions): Rework.
(eglot--read-execute-code-action): Tweak.
(eglot-code-action-suggestion): New function.

* etc/EGLOT-NEWS: Mention new feature.

* doc/misc/eglot.texi (Eglot Features): Mention new feature.
(Customization Variables): Mention new variables.

(cherry picked from commit d6a502fc7a69dfa11aa100da5966a6962a82f613)

Eglot: introduce eglot-advertise-cancellation

Setting this variable to true causes Eglot to send special
cancellation notification for certain stale client request.

This may help some LSP servers avoid doing costly but ultimately useless
work on behalf of the client, improving overall performance.

Request cancellation is described in

   https://microsoft.github.io/language-server-protocol/
      specifications/lsp/3.17/specification/#cancelRequest

* lisp/jsonrpc.el (jsonrpc-request): Accept function as value for
CANCEL-ON-INPUT.

* lisp/progmodes/eglot.el (eglot--request): Rework.

* doc/misc/eglot.texi (Customizing Eglot): Mention
eglot-advertise-cancellation.

(cherry picked from commit 7f0ef9655cdc28c3b8055e32c9e84ea57339b139)

Eglot: restructure and overhaul documentation

* doc/misc/eglot.texi (Starting Eglot): Tweak.
(Using Eglot): Remove link to 'Eglot Variables'.
(Eglot Features): Rework.
(Eglot and Buffers): Rework.
(Eglot Commands): Rework.
(Customizing Eglot): New chapter.
(Customization Variables): Now contains what 'Eglot Variables'
used to contain.
(Other Variables): New section.
(More Customization): New section.
(...elsewhere...): Apply 'fill-paragraph'.

(cherry picked from commit 9e4b626f7eea788966a1ad92d4af76f8b0a2573f)

Eglot: symbol highlighting now done in eldoc-documentation-functions

Even though highlighting the thing at point isn't really producing
documentation at point, theory and practice have shown that using
eldoc-documentation-functions for this is a feasible way to avoid
reimplementing all the idle timer logic for such functionality.

In fact, we were already using ElDoc for this purpose, but this commit
makes it so the new eglot-highlight-eldoc-function is a first class
citizen in eldoc-documentation-functions, so users can manipulate it if
so desired.

* lisp/progmodes/eglot.el (eglot--managed-mode): Use
eglot-highlight-eldoc-function
(eglot-hover-eldoc-function): Don't mix highlighting with hover.
(eglot-highlight-eldoc-function): Rename and rework from
eglot--highlight-piggyback

(cherry picked from commit 60166a419f601b413db86ddce186cc387e8ec269)

Fix previous commit for Changing Window Layouts

* doc/lispref/windows.texi (Changing Window Layouts): Remove wrong
example.  Change some indentations.

(cherry picked from commit 33827bed049e348da7544489903c7d6870f1500a)

Fix frame-visible-p for tty root frames

* src/frame.c (Fframe_visible_p): Don't unconditionally return t for tty
root frames.

(cherry picked from commit d60198d7a49acd8cd2c250625ac57deef484cee2)

Avoid some make_formatted_string mallocs

* src/alloc.c (make_formatted_string):
Grow the local buffer from 64 to MAX_ALLOCA bytes.

(cherry picked from commit 1f1088188e8b9319f60141a093431f1f85c2b03c)

Make vmessage a bit safer

* src/xdisp.c (vmessage): Avoid undefined behavior if
FRAME_MESSAGE_BUF_SIZE (f) is zero, or if doprnt generates output
containing only encoding errors.  Although it’s not clear whether
either is possible, it is better to be safe.  Also, clarify via a
new local message_bufsize.

(cherry picked from commit 8e7588a2675655b88dc3ac5b7ed46ab6f1b891ec)

Avoid printing NUL characters in 'message' (bug#75900)

* src/xdisp.c (vmessage): Increase buffer size to fit an extra
multibyte character.  On buffer overflow, drop the last multibyte
character to determine an accurate byte length.

(cherry picked from commit 8812f526cfb145e00ee4cb74eac05b25953da02c)

Fix buffer overflows in doprnt (bug#75900)

* src/doprnt.c (doprnt): Clear rest of buffer on multibyte overflow.
Always decrement bufsize when writing a byte.

(cherry picked from commit 0ed913cf46a8b07a39b065216272a7aa07123282)

doprnt %X support

* src/doprnt.c (doprnt): Also support %X, since callers
now use %X.

(cherry picked from commit 9b2e230c063f3e716c08a31685e16dff91130f4d)

Don't use obsolete face variables in lisp-mode.el

* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1)
(lisp-cl-font-lock-keywords-1, lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2): Don't use obsolete face variables.

(cherry picked from commit ba60fa3deaa030eb4815caa8c180ac841709e86a)

; Skip commit 29c6dad78db6d599108612f120cd0fb1fb18e105

; Skip commit 2d386fc4490c8e61ed05384ec486ef0d5e7164b1

Fix clicking in child frames with GPM

* src/term.c (handle_one_term_event): Store child frame
coordinates in event.

(cherry picked from commit 5eae7f5227c7789dea45cef26fec17c057024670)

; Fix workaround for xt-mouse-tests

* lisp/xt-mouse.el (xterm-mouse-event): For running this in batch mode,
fix computation of x and y.

(cherry picked from commit 59050c3e8c500e216ec7214195c9441ecb4a031c)

In Elisp manual document new functions for changing window layouts

* doc/lispref/windows.texi (Changing Window Layouts): New section
to document the new functions for changing window layouts.
* doc/lispref/elisp.texi (Top): Add entry for new section.

(cherry picked from commit 827dfe5a72f36cb6b61b435a85d50ac725616a09)

; Fix byte-compilation warnings

(cherry picked from commit d2ffa0fa488fcfec26c042d30d125915eb558444)

Pacify -Wanalyzer-use-of-uninitialized-value

With ‘configure --enable-gcc-warnings’,
gcc (GCC) 14.2.1 20250110 (Red Hat 14.2.1-7) on x86-64
complained, as it apparently did not want to assume that enum
variables have one of the listed values.
Work around the problem by using tables rather than
switch statements.  This gives up a little static
checking but I don’t see any other easy way to pacify
GCC without disabling the warnings entirely.
* src/pdumper.c (dump_fwd_int, dump_fwd_bool, dump_fwd_obj)
(dump_fwd_buffer_obj, dump_fwd_kboard_obj):
Last arg is now void const * so that these functions’ addresses
can all be put into the same array.
(dump_fwd, dump_anonymous_allocate_posix, dump_map_file_posix):
Use an array rather than a switch.
(mem_prot_posix_table): New static constant table.

(cherry picked from commit 1ed769a3cb753a86badba8a2878fa788a6fdc1f8)

Fix unlikely eassert failure in invalid_radix_integer

* src/lread.c (invalid_radix_integer):
Simplify by using sprintf with a big-enough buffer.

(cherry picked from commit a5c47258ffe6d037e3e3c3665ca82a18661cc82c)

Fix unlikely eassert failure in xg_set_widget_bg

* src/gtkutil.c (xg_set_widget_bg): Simplify by using
sprintf with a big-enough buffer.

(cherry picked from commit f809302fe5543e20ff7f06a81c263fd29f3ff995)

Fix unlikely eassert failure in pgtk_enumerate_devices

* src/pgtkterm.c (pgtk_enumerate_devices): Prefer
make_formatted_string to snprintf + build_string + eassert, as
it’s simpler and won’t crash Emacs if the eassert fails.

(cherry picked from commit 901659bb7046bef4ca10490cf47644fb2bc6d753)

Minor format_string tuneup

* src/comp.c (format_string): Prefer strcpy to doing things by hand
in a place where strcpy is easier to read, generates
more-efficient code, and similar parts of Emacs do strcpy.

(cherry picked from commit f8b8dddce90f5cbf6ca0be2e72b4e11cdcf581fe)

Ignore -fanalyzer-null-argument in pgtkterm.c

* src/pgtkterm.c: Ignore -Wanalyzer-null-dereference.
I don’t have time to look into all the diagnostics,
but the ones I checked seemed to be false alarms with
gcc -std=gnu23 on x86-64, and we are ignoring this
diagnostic in other modules.  This is GCC 14.2.1
20250110 (Red Hat 14.2.1-7).

(cherry picked from commit 8d8272d02e38ee3624cd3f16767f3c60fb3383ea)

Pacify -fanalyzer-null-argument on pgtk_term_init

* src/pgtkterm.c (pgtk_term_init): Use xstrdup, not g_strdup.
The value is never freed so the allocator shouldn’t matter.

(cherry picked from commit 728c7904fef23059524eeab3193e1634a98d1d35)

Protect against GCing of last_mouse_window

* src/window.c (last_mouse_window): New global var.  All static
instances removed, and all their uses replaced with this global
var.  This fixes a very unlikely bug where last_mouse_window was
GC’ed and a new window created in its place.  It also fixes several
places that assumed NIL_IS_ZERO without static_asserting it.
(init_window_once): Initialize the new var.

(cherry picked from commit 2e8ef0910412aef8f9f1beba7c942473ad8602bb)

Pacify GCC in pgtkselect malloc alignment

* src/pgtkselect.c (pgtk_size_for_format): Remove.
(pgtk_get_window_property): Third arg is now void **, not unsigned
char **.  Omit last arg.  All callers changed.  Simplify
allocation to pacify GCC 14.2.1 complaint about malloc size
mismatching size of array: there’s no need for an extra byte when
converting from ldata to idata.
(selection_data_to_lisp_data): Third arg is now void const *,
not unsigned char const *.  All callers changed.
Omit unnecessary casts.  Make some locals more local.

(cherry picked from commit ff65cc9944dc0b37986d512ee8b9817c6913db36)

Avoid undefined behavior with botched pgtk menu

* src/pgtkmenu.c (pgtk_menu_show): Do not dereference save_wv if
null.  Problem found by gcc 20250110 (Red Hat 14.2.1-7)
-Wanalyzer-null-dereference.

(cherry picked from commit c0d83876f18cb21abae299d3b4a2a2bd7f117252)

Use gtk_disable_setlocale

* src/pgtkterm.c (pgtk_term_init):
* src/xterm.c (x_term_init):
Use gtk_disable_setlocale rather than fixup_locale.

(cherry picked from commit 06fd3f4e98d683b6595899861e47e931724e7020)

Avoid unlikely int overflow.

* src/pgtkterm.c (pgtk_term_init):
* src/xterm.c (x_term_init):
Use a bool, not an int that keeps incrementing,
to record whether initialization has occurred.

(cherry picked from commit a1e4f6a35c70cf265c77b445288f4e0ab6ffc19f)

Beware large stack growth in pgtk_menu_show

* src/pgtkmenu.c (pgtk_menu_show): USE_SAFE_ALLOCA instead of alloca.
Problem found with --enable-gcc-warnings.

(cherry picked from commit 6ff06ff738ead96d7b4cb59eda15a1c72e2b5776)

Fix x-show-tip bignum crash

* src/pgtkfns.c (compute_tip_xy): Fix crash if user specifies
bignums.  Bug found with --enable-gcc-warnings.

(cherry picked from commit 17a8bf53f390718756e397cc0b31c1ef2c7de5f0)

Prefer make_formatted_string in svg_load_image

* src/image.c (svg_load_image): Prefer make_formatted_string to
snprintf, as this simplifies the code and does not truncate the
resulting string arbitrarily.

(cherry picked from commit c50e8c24247eb69d85b004a72197e710c8e1e32a)

Simplify building of color names in image.c

* src/image.c (make_color_name): New function.
(image_background, image_build_heuristic_mask, png_load_body): Use it.

(cherry picked from commit 028fae966142b6e2330b9250fb4cdf2cbd8e1446)

Simplify make_formatted_string API

From a suggestion by Pip Cet.
* src/alloc.c (make_formatted_string): Omit first argument,
to simplify the calling convention.  All callers changed.
* src/doprnt.c (doprnt): Also support %u.  Update doc.

(cherry picked from commit f885806fdf1aa862ad55d124e9795794fed0b964)

Fix unlikely time zone abbreviation bug

* src/timefns.c (Fcurrent_time_zone): Fix double-"-" bug when time
zone name is not known and time zone offset is -3600 or less.
Also, stop assuming that make_formatted_string works with "*"
precisions; this might ease future changes.

(cherry picked from commit bcfd4d21b0a62c5c15b919fa28673066c493775a)

Don't use obsolete face alias in themes

* etc/themes/leuven-dark-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/tango-theme.el: Don't use obsolete face alias
'smerge-refined-change', preferring instead 'smerge-refined-changed'.

(cherry picked from commit b06364f1b667e7960d1724293398179f280e910b)

; Skip commit 52c41a66bad451dd43940cb313c62a95f464db1e

; Skip commit 2b3599bb08e8ccfe49bbaa28693fed8dca62440b

Fix the Android port

* src/term.c (tty_frame_at) [HAVE_ANDROID]: Always return nil.

* src/terminal.c (cursor_to, raw_cursor_to) [HAVE_ANDROID]:
Don't call root_xy.

(cherry picked from commit 8d11871c63e65459fd14f1cbe08bf0460c452ac6)

Fix compilation warnings in pdumper with !HAVE_NATIVECOMP

* src/pdumper.c [!HAVE_NATIVECOMP] (cold_op, dump_subr): Fix
compilation warnings.
Ref: https://lists.gnu.org/r/emacs-devel/2025-01/msg01003.html

(cherry picked from commit aec9e66178793e631f0583768315a6371054c907)

Prefer static switch-case checking in pdumper

* src/pdumper.c (dump_fwd, dump_symbol, dump_drain_cold_data)
(dump_do_fixup, dump_anonymous_allocate_w32)
(dump_anonymous_allocate_posix, dump_map_file_w32, dump_map_file_posix)
(dump_do_emacs_relocation): Remove default clauses to allow static
checking using -Wswitch.

(cherry picked from commit 6e2e7265a04f63f482db7fbdfd8e2519d8bfe03e)

* lisp/progmodes/xref.el (xref-after-jump-hook): Remove 'recenter'

scope.el: Initial 'cl-tagbody' support

Avoid crashes in Fdocumentation caused by incorrect data types

Note that this can only change things when function-documentation is
defined or overloaded incorrectly.

* src/doc.c (Fdocumentation): Check that the cdr of a docstring cons
is a fixnum.

(cherry picked from commit b07c12ce59c96db753a1f8f3a829f9ab5514e35f)

; Fix last change

* lisp/disp-table.el (display-table-slot)
(set-display-table-slot):
* etc/NEWS:
* doc/lispref/display.texi (Display Tables): Fix punctuation and
typos.

(cherry picked from commit 8cfb4e35da4b7ffa84c521e28fd592c40209d04e)

Display separators on tty menus with display table entries

* src/xdisp.c (display_tty_menu_separator): Lookup separator char in
standard-display-table, make a string, and display that using
display_string.
* src/xdisp.c (display_tty_menu_separator_char): New function.
(display_tty_menu_separator): Use it.
* lisp/disp-table.el (display-table): Increase from 12 to 18.
(box-double-vertical, box-double-horizontal, box-double-down-right)
(box-double-down-left, box-double-up-right, box-double-up-left): New
symbols for extra slots.
(display-table-slot, set-display-table-slot): Change doc string.
(describe-display-table): Describe new slots.
(standard-display-unicode-special-glyphs): Define new slots.
* src/disptab.h (DISP_TABLE_P): Add enumerators.
(DISP_TABLE_EXTRA_SLOTS): Define based on enum box.
* src/dispnew.c (produce_box_glyphs): Add new enumerators to switch to
make it exhaustive.
* src/xdisp.c (display_tty_menu_separator): Use BOX_DOUBLE_HORIZONTAL
for '=' if present.
* doc/lispref/display.texi: Add documentation.
* etc/NEWS: Mention in NEWS.

(cherry picked from commit 4e78a3e117f4ca0b6b9f3b7a2d7919cb5b2e0295)

Tweak .gitattributes

Use dired--inhibit-auto-revert for fixing bug#71264

The original fix bound auto-revert-mode to nil which had the side-effect
of disabling auto-revert forever in this buffer because
auto-revert-handler removes the buffer from auto-revert-buffer-list when
it's called but auto-revert-mode is nil.

* lisp/dired.el (dired-internal-do-deletions): Bind
dired--inhibit-auto-revert during deletion (bug#71264).

(cherry picked from commit 01d93d56cd469ddb45d142da948caef9f2dc1a3f)

Change doc string of frame-visible-p

* src/frame.c (Fframe_visible_p): Don't say it always returns t for tty
frames.

(cherry picked from commit 35d39278599caf30eb4bfbd83118ffe15d2bc705)

Replace is_frame_ancestor with frame_ancestor_p

* src/dispnew.c (is_frame_ancestor): Removed.
(frame_z_order_cmp): Use frame_ancestor_p.
(copy_child_glyphs): Ditto.
* src/dispextern.h: Declaration removed.
* src/term.c (mouse_get_xy): Use frame_ancestor_p.

(cherry picked from commit 85aec497c71e26b66ecfc85c20d7888336300e1f)

Add 'treesit-forward-comment' with 'forward-comment-function'

* lisp/treesit.el (treesit-forward-comment): New function.
(treesit-major-mode-setup): Set 'forward-comment-function' to
'treesit-forward-comment' if the 'comment' thing is defined.

* src/syntax.c (forward-comment-function): New variable.
(Fforward_comment): Call the function from 'forward-comment-function'
when it's non-nil (bug#75609).

(cherry picked from commit 63df2164903e0cd6819187483a64b892aa7e0219)

* lisp/treesit.el: Display treesit-explore buffer below selected window.

(treesit-explorer-switch-parser, treesit-explore):
Use display-buffer-below-selected for display-buffer (bug#75079).

(cherry picked from commit 3bc6b88cc71b8ccc96b5e61d895e5208009aa3c0)

(scope-define-global-minor-mode): Remove.

scope.el: Optimize.

(elisp-completion-at-point): Complete custom theme names

(cl-case): Leave keywords unquoted.

Remove 'ispell-help'

; (let-alist): Document double-dot escape syntax.

Handle `let-alist' double-dot escape

scope.el: Finalize refactor and let-alist support

(when-let*): Warn if body is empty

* lisp/subr.el (when-let*): Warn if body is empty.
* lisp/textmodes/tex-mode.el (xref-backend-references): Fix use of
`when-let*`.

(cherry picked from commit 442d04081bbe9913def50b543e499422c4ad9ece)

; * src/term.c (handle_one_term_event): Fix last change.

(cherry picked from commit e8f173f0ba9327033781429ea9a1d99ff8d2f751)

Restore the old behavior of `bookmark-write-file'

* lisp/bookmark.el (bookmark-write-file): Use 'pp-28' to avoid
filling the bookmarks.  (Bug#75775)

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

Fix the mistake that led to the reverts

* src/terminal.c (raw_cursor_to): Fix reversed arguments.

(cherry picked from commit 1d086441166f564d8f8cd4945cb9590410c9676b)

Reapply "Multi-tty: selected frame can be a GUI frame"

This reverts commit d93d822285813b89f2444ef93c5747cbeb67a46b.

(cherry picked from commit 20f26723774d50292f21487fb21b92355444d678)

Reapply "Fix mouse position handling for nested tty child frames"

This reverts commit e2cc52dbcd196f95cc79c6c6d899b9e86e696fe5.

(cherry picked from commit ccf3f8d21e346ac1fdb092079227c37f987f253d)

Reapply "Fix tty-frame-at for nested tty child frames"

This reverts commit 9ad28959d6895720865c0718bf60f4b7b0b144f3.

(cherry picked from commit e839b83c828fe09546edcc46dcfc5e09dd39b9fe)

Reapply "Fix cursor positioning of nested tty child frames"

This reverts commit 65036323fc1cdf18a7812b1c922583e6466972a6.

(cherry picked from commit 26b144f241c7843b635415f2b68b8c3df0b23e02)

Reapply "Simplify absolute (x, y) computation on ttys"

This reverts commit 13fdcd730ff63bf79caace9a6e46aff5f944b1b7.

(cherry picked from commit 945ed044cd8ab67ccbbc185c19f500f723cd9045)

Delete all overlays that belong to an editable-field

* lisp/wid-edit.el (widget-specify-field): Store the end overlay
that we sometimes create for an editable-field widget.
(widget-field-value-delete): Make sure we delete all overlays
that belong to the widget.  (Bug#75646)

* test/lisp/wid-edit-tests.el (widget-test-delete-field-overlays): New
test.

(cherry picked from commit d4220a17c4ecf4639a276352149218077c1d6315)

python-mode: add 'exit' and 'quit' to the list of block-enders

'exit()' and 'quit()' end the current codeflow, there can't be
any code past it, similarly to 'return', 'continue', etc.  So
when calculating indentation for the line next to 'exit()',
'os.exit()', 'os._exit()', 'sys.exit()' and 'quit()', decrease
the indentation level.
* /lisp/progmodes/python.el (python-rx): Add 'exit()', 'os.exit()',
'os._exit()', 'sys.exit()', 'quit' to the list of block-enders.
(Bug#75729)

(cherry picked from commit 0514619b2c944ae17fbf649496595c5e866ff785)

lisp: Introduce a `lisp-fill-paragraph-as-displayed' variable.

Starting with Emacs 28, filling strings now happens in a
narrowed scope, and looses the leading indentation and can cause
the string to extend past the fill-column value.  Introduce
`lisp-fill-paragraph-as-displayed' as a new variable allowing
opting out of this new behavior in specific scenarios (such as
when using the Scheme major mode, say).

* lisp/emacs-lisp/lisp-mode.el
(lisp-fill-paragraph-as-displayed): New variable.
(lisp-fill-paragraph): Honor it, by avoiding the logic narrow to
strings before applying fill-paragraph.
* test/lisp/emacs-lisp/lisp-mode-tests.el
(lisp-fill-paragraph-respects-fill-column): Test it.
(lisp-fill-paragraph-docstring-boundaries): New test, as a
safeguard to avoid regressions.

Fixes: bug#56197
(cherry picked from commit 192355e54af91ad6e7d1343071a749e1ced29400)

Avoid error with empty search string in Customize

* lisp/cus-edit.el (custom-buffer-create-internal): Only call
customize-apropos if the string is not empty.  (Bug#75714)

(cherry picked from commit d4ca688abefa90cf3e54add036b32c06b7da6363)

; Improve prompts and error messages in 'info-look'

* lisp/info-look.el (info-lookup-change-mode): Improve text of
prompt and error messages.  (Bug#75634)

(cherry picked from commit 062da7003f98cb8352e9cc91e0a8fd7de11b2bd1)

; Clean up 'xterm-mouse-mode' auto-enabling vars

* lisp/term/xterm.el (xterm--auto-xt-mouse-allowed-names)
(xterm--auto-xt-mouse-allowed-types): Use `rx' macro and
update docstring.  (Bug#74833)

(cherry picked from commit 0f3d4e157fb9e638f568128096c818d4485b60fa)

Reload <pkg>-loaddefs when replacing built-in packages

* lisp/emacs-lisp/package.el (package--reload-previously-loaded):
Add new optional argument to display a specified warning upon
reloading.
(package-activate-1): Always reload libraries when loading built-in
packages.  This avoids ELPA versions of built-in packages to be
mixed with the built-in package autoloads.

Link: https://yhetil.org/emacs-devel/87y1adrria.fsf@localhost/
(cherry picked from commit 5878c9ae7c958af1828e85a7b4d922c1a8c1b6bf)

ibuffer: Display column titles in header line

If the option `ibuffer-use-header-line' is set to `title',
display column titles in the header line.
* lisp/ibuffer.el (ibuffer--format-title)
(ibuffer--format-summary): New functions extracted from
`ibuffer-update-title-and-summary'.
(ibuffer-update-title-and-summary): Use them.
(ibuffer-update): Do not always override `header-line-format'.
(ibuffer-use-header-line): Update docstring and option `:type'.
* lisp/ibuf-macs.el (define-ibuffer-sorter): Add "@" to the
interactive specification for clicks on the header line.

* etc/NEWS: Announce the change.
(Bug#75497)

(cherry picked from commit 5294d450da47734bbe2ca259505674bcae5ff573)

lisp/repeat.el: Don't expose `cl-extra/cl-lib` distinction

(cherry picked from commit 5ee12424b600fe5d677f6b526ab038bad4747f83)

ibuffer: New defcustom `ibuffer-human-readable-size'

* lisp/ibuffer.el (ibuffer-human-readable-size): New
defcustom.
(define-ibuffer-column size): Use it.

* etc/NEWS: Mention new defcustom.
(Bug#75495)

(cherry picked from commit 35576fde5670dffe104a6b2a76837a1f0a4c16ce)

Quote identifiers in SQL queries in 'sqlite-mode'

* lisp/sqlite-mode.el: (sqlite-mode-list-tables)
(sqlite-mode-list-columns, sqlite--mode--list-data)
(sqlite-mode-delete): Quote identifiers (table and column
names) in the SQL queries.  Fixes, e.g., opening databases
which have a table called "values".  (Bug#75598)

(cherry picked from commit 5e0fc49f3b14928f08eb314b15f70ccbb2ce7229)

Revert "Simplify absolute (x, y) computation on ttys"

This reverts commit 5e132835ad320be1d5c45ffbf83d67d16fc7bf96.

(cherry picked from commit 13fdcd730ff63bf79caace9a6e46aff5f944b1b7)

Revert "Fix cursor positioning of nested tty child frames"

This reverts commit 8cbb3c7335ff03b6fae4efeae126e91993cb962a.

(cherry picked from commit 65036323fc1cdf18a7812b1c922583e6466972a6)

Revert "Fix tty-frame-at for nested tty child frames"

This reverts commit 9693f2a95ad14bf0caa34e60d72722d4dd4d85c9.

(cherry picked from commit 9ad28959d6895720865c0718bf60f4b7b0b144f3)

Revert "Fix mouse position handling for nested tty child frames"

This reverts commit f37559a1ee035d184bc4db6e4f597281d3ac6879.

(cherry picked from commit e2cc52dbcd196f95cc79c6c6d899b9e86e696fe5)

Revert "Multi-tty: selected frame can be a GUI frame"

This reverts commit 57b7c07b3709d9a2b2c70e0c8218a52448368a12.

(cherry picked from commit d93d822285813b89f2444ef93c5747cbeb67a46b)

; * admin/admin.el (set-version): Note about Android.

(cherry picked from commit 52dc01f1c8b3c14405cc9ce2a825ea68edcdadc8)

Multi-tty: selected frame can be a GUI frame

* src/dispnew.c (frame_selected_window_frame): New function.
(is_cursor_obscured): Use it.
(terminal_cursor_magic): Use the frame of the selected window of he root
frame.
(combine_updates_for_frame): Move Android conditional compilation out.

(cherry picked from commit 57b7c07b3709d9a2b2c70e0c8218a52448368a12)

Fix mouse position handling for nested tty child frames

* src/dispnew.c (child_xy): New function.
* src/dispextern.h: Declare it.
* src/term.c (tty_frame_at): Return child-relative (x, y) in output
parameters.
(Ftty_frame_at): Return a list (FRAME CHILD-X CHILD-Y).
(handle_one_term_event): Adapt use of tty_frame_at.
* lisp/xt-mouse.el (xterm-mouse-event): Use new tty-frame-at.

(cherry picked from commit f37559a1ee035d184bc4db6e4f597281d3ac6879)

Fix tty-frame-at for nested tty child frames

* src/term.c (tty_frame_at): Translate child frame origin to absolute
coordinates.

(cherry picked from commit 9693f2a95ad14bf0caa34e60d72722d4dd4d85c9)

Fix cursor positioning of nested tty child frames

* src/terminal.c (cursor_to, raw_cursor_to): Fix translation to root
coordinates.

(cherry picked from commit 8cbb3c7335ff03b6fae4efeae126e91993cb962a)

Simplify absolute (x, y) computation on ttys

* src/dispnew.c (root_xy): New function.
(frame_pos_abs): Removed.
(frame_rect_abs, abs_cursor_pos): Use root_xy.
* src/dispextern.h: Declare root_xy.
* src/term.c (mouse_get_xy): Use it.

(cherry picked from commit 5e132835ad320be1d5c45ffbf83d67d16fc7bf96)

Avoid double spaces around abbrevations in Texinfo

* doc/emacs/custom.texi (Init Rebinding):
* doc/emacs/dired.texi (Operating on Files):
* doc/emacs/emacs.texi (Top):
* doc/emacs/emerge-xtra.texi (Emerge):
* doc/emacs/files.texi (Files):
* doc/emacs/frames.texi (Drag and Drop):
* doc/emacs/misc.texi (Hyperlinking):
* doc/emacs/modes.texi (Modes):
* doc/emacs/mule.texi (Input Methods):
* doc/emacs/windows.texi (Window Tool Bar):
* doc/lispintro/emacs-lisp-intro.texi
(Lexical & Dynamic Binding Differences):
* doc/lispref/elisp.texi (Top):
* doc/lispref/functions.texi (Functions, Generic Functions):
* doc/lispref/hash.texi (Defining Hash):
* doc/lispref/keymaps.texi (Creating Keymaps):
* doc/lispref/lists.texi (Property Lists):
* doc/lispref/modes.texi (%-Constructs):
* doc/lispref/nonascii.texi (Character Properties):
* doc/lispref/processes.texi (Misc Network):
* doc/lispref/searching.texi (Regexp Functions):
* doc/lispref/syntax.texi (Syntax Table Internals):
* doc/lispref/text.texi (Filling, Checksum/Hash)
(JSONRPC deferred requests):
* doc/misc/calc.texi (What is Calc, Modes Tutorial):
* doc/misc/cc-mode.texi (List Line-Up, Operator Line-Up)
(Custom Macros, Indenting Directives):
* doc/misc/efaq.texi (Colors on a TTY, Security risks with Emacs):
* doc/misc/eglot.texi (Eglot Variables):
* doc/misc/erc.texi (Connecting):
* doc/misc/eshell.texi (Aliases, Completion):
* doc/misc/flymake.texi (Backend functions):
* doc/misc/gnus-faq.texi (FAQ 5 - Composing messages):
* doc/misc/gnus.texi (Gnus Unplugged, Window Layout)
(Filtering Incoming Mail, History):
* doc/misc/idlwave.texi (Online Help, Catalogs):
* doc/misc/wisent.texi (Wisent Overview): Be more consistent with
abbreviations.  Use @: or comma or rewrite to avoid double spaces.
Ref: https://lists.gnu.org/r/emacs-devel/2025-01/msg00909.html

(cherry picked from commit fb282da2a0756d4e6de16b5879e42204f0d33e5b)

; time-stamp: Rename some internal symbols

* lisp/time-stamp.el: (time-stamp-string-preprocess): Rename 'alt-form'
to 'colon-cnt' because it is now an integer.
* test/lisp/time-stamp-tests.el: Rename 'formatz-generate-tests' to
'define-formatz-tests'.

(cherry picked from commit a00e6e7143d5ebf7282b5e5b410e1bd882634d57)

; * lisp/time-stamp.el: Improve two documentation strings

(cherry picked from commit 77fe4fbeffc723337bd295e593c8062cd4ab7e43)

; * doc/emacs/files.texi: only one time stamp index entry

(cherry picked from commit 0d38f1d07b27ad3634a667388c39d55ed2bb6137)

; Skip commit bc1ab8ac3d8fd8f42641ad45820df995525ddf0b