; Skip commit bf7db88ce1f4c91f9d5b064c7484d77f17b0de37

; Skip commit 000424eb9ebfed271507dc403918a35c1b39631e

; Skip commit 5b5671587fbad2b4b0f1c12b37abd175033c6a16

; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).

(cherry picked from commit 31124abdefe0886f7bc245bca7b8334d459ad79a)

Fix: make 'xwidget-webkit-scroll-backward' scroll backwards

* lisp/xwidget.el (xwidget-webkit-scroll-backward): Move
hyphen out of %-formatter, changing semantics from a padding
specifier to a negative sign.  (Bug#71792)

Copyright-paperwork-exempt: yes
(cherry picked from commit 44f269d6e606acab6245d9ba12175bdd6252d63e)

Add jsdoc support to php-ts-mode in <script> element

In the <script> element, enable jsdoc embedding in JavaScript.
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--language-source-alist): Add jsdoc to parser recipe.
(php-ts-mode): Add jsdoc parser check and a new rule for
'treesit-range-settings'.  Update the commentary section.
(Bug#71771)

(cherry picked from commit 736b7cad406b28e95b1119feea7b083d8711d09e)

Update to Transient v0.7.2-4-gf75bc48d

(cherry picked from commit 5f3d964e397edd807c544f42a6db6b068a20c912)

Fix typo incurring leaks of face structures

* src/xfaces.c (free_realized_face): Always free realized face
structures, and avoid sending X requests when the display is not
available, not when it is.

(cherry picked from commit 2d8881d5267febd0bc4117c2b7e5ee6c33ef436e)

; Fix use of @footnote in cc-mode.texi

* doc/misc/cc-mode.texi (Comment Commands, Minor Modes)
(Hungry WS Deletion): Move @footnote's out of @item's, to avoid
warnings from makeinfo.

(cherry picked from commit 219501dd629811e73d884300534f56647596fb6f)

Sync with Tramp 2.7.1

* doc/misc/trampver.texi:
* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
(customize-package-emacs-version-alist): Add Tramp version
integrated in Emacs 30.1.

* lisp/net/tramp-compat.el:
* lisp/net/tramp-message.el (tramp-warning): Use `lwarn'.

* test/lisp/net/tramp-tests.el
(tramp--test-deftest-without-file-attributes): New defmacro.
(tramp-test18-file-attributes-without-file-attributes)
(tramp-test19-directory-files-and-attributes-without-file-attributes)
(tramp-test18-file-attributes-without-file-attributes)
(tramp-test42-utf8-without-file-attributes): New tests.

(cherry picked from commit f0a487997564fb11dd6e6e8ba2361c9d8fc68f5a)

; * etc/NEWS: Move the mwheel entry to a better place.

(cherry picked from commit 53dcf2b94929d3347e61a01be9ea09119a233333)

Flag checkdoc-package-keywords-flag as a :safe variable

* lisp/emacs-lisp/checkdoc.el: Mark 'checkdoc-package-keywords-flag'
as a safe local variable.  (Bug#71812)

(cherry picked from commit d3b100d41922eea3650005881e388affa3b8236c)

; Sort tree-sitter modes in NEWS

* etc/NEWS: Sort tree-sitter modes alphabetically.

(cherry picked from commit a5726782d0345b9459f4648c6af40544efbe33ad)

; * etc/NEWS: Rearrange "New Modes and Packages in Emacs 30.1".

This places new modes and packages in rough order of
importance (relevance to users) with most important first.
Feel free to amend.

(cherry picked from commit daa89dc939e6336a3de37607379bb6a8311b54ad)

; * etc/NEWS: Move many items.

This moves items to more logical places in the hierarchy.
We might want to give this another pass or three.

(cherry picked from commit 4ddbf4f70ef74c76484cb0400ac30a3933234ec2)

; * etc/NEWS: Copy-edits.

(cherry picked from commit 437b1ced268a168a7f1262524716ac07f8b08622)

Expand docstring of which-key-mode

* lisp/which-key.el (which-key-mode): Expand docstring.

(cherry picked from commit 7372b2eb302f62536437b807f5220e5adfafbcf4)

(cherry-pick-new-commits): Only fetch once, or with prefix arg

; Use 'keymap-set' in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-map): Replace 'define-key'
with 'keymap-set'.  (Bug#71736)

(cherry picked from commit 8198a144376cfea3490ea5628392fb3a49fec2d6)

Improve documentation of 'remove-overlays' in ELisp manual

* doc/lispref/display.texi (Managing Overlays): Update
documentation of 'remove-overlays'.  (Bug#57534)  (Bug#13648)

(cherry picked from commit df0eb5be1eac7763236a99ffeb6e2b3561955bd9)

Fix link to major mode variable in docstring

* lisp/emacs-lisp/easy-mmode.el (easy-mmode--arg-docstring): Fix link to
major mode variable in docstring.  (Bug#71815)

(cherry picked from commit 73c1252bb6b7cc61d9f992818568d3c57de4ff67)

Make `shell-mode' more robust

* lisp/shell.el (shell-mode): Ensure that
`comint-input-ring-file-name' is non-nil when calling `file-truename'.

(cherry picked from commit c4ad54812acaf8f156962047eaaaf75b0c0ecf96)

* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Typos.

(cherry picked from commit cbede3d43df99177cc6c2d63a24bbec9b19da451)

Fix Cygwin build

* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): Define
and retrieve handle to USP10.DLL on Cygwin.

(cherry picked from commit 8d55b38e2a1212c47bfb9f93a73fa50b9f291609)

Restore functionality on Windows 98

* configure.ac (W32_LIBS): Don't link with -lusp10 on non-Cygwin
systems.

* src/emacs.c (main): Call globals_of_w32 before the startup
directory is initialized.

* src/w32.c (maybe_load_unicows_dll): Call
load_unicows_dll_for_w32fns.

* src/w32.h: Update prototypes.

* src/w32fns.c (Fx_create_frame, w32_create_tip_frame): Do not
register the Uniscribe font driver when unavailable.
(pfnSHFileOperationW): New function pointer.
(Fsystem_move_file_to_trash): Load UNICOWS.DLL if not yet
loaded.  Call SHFileOperationW through said function pointer.
(pfnShellExecuteExW): New function pointer.
(Fw32_shell_execute) [!CYGWIN]: Load UNICOWS.DLL if not yet
loaded.  Call ShellExecuteExW through said function pointer.
(pfnShell_NotifyIconW): New function pointer.
(add_tray_notification, delete_tray_notification): Call
Shell_NotifyIconW through said function pointer.
(Fw32_notification_notify): Load UNICOWS.DLL.
(Fw32_notification_close): Return if Shell_NotifyIconW is
unavailable, as when UNICOWS.DLL has yet to be loaded.
(load_unicows_dll_for_w32fns): New function.

* src/w32notify.c (pfnReadDirectoryChangesW): New function
pointer.
(watch_completion, remove_watch, Fw32notify_add_watch)
(Fw32notify_rm_watch, Fw32notify_valid_p): Call
ReadDirectoryChangesW through said function pointer, and assert
its presence.
(globals_of_w32notify): Load ReadDirectoryChangesW from
KERNEL32.DLL.

* src/w32uniscribe.c (pfnScriptItemize, pfnScriptShape)
(pfnScriptPlace, pfnScriptGetGlyphABCWidth, pfnScriptFreeCache)
(pfnScriptGetCMap): New function pointers.
(uniscribe_close, uniscribe_shape, uniscribe_encode_char)
(uniscribe_check_otf_1): Call Uniscribe functions through the
same.
(syms_of_w32uniscribe_for_pdumper): Load Uniscribe library and
required functions from the same, and if unavailable, return
while leaving uniscribe_available intact.  On Cygwin, simply
assign USP10.DLL functions to the said new function pointers.

(cherry picked from commit 18e7a9f3d0c27385f8efeb2b1ef80b3446dca288)

* lisp/avy.el: Minor fixes.

* lisp/avy.el: New file.

Fix handling of help keys in 'y-or-n-p'

(describe-library): Mention package that library is part of

New command 'propertize-region'

(minibuffer-force-complete): Indicate number of possible completions

(read-extended-command): Be less weird

Inherit text props in Completion Preview insertion commands

When completing with Completion Preview mode commands,
inherit text properties from surrounding text similarly to
other completion commands, such as 'completion-at-point'.

* lisp/completion-preview.el (completion-preview-insert)
(completion-preview-partial-insert)
(completion-preview-complete): Use 'insert-and-inherit'
instead of 'insert' to insert text for completion.
* test/lisp/completion-preview-tests.el
(completion-preview-insert-inherits-text-properties): New
test.

; Skip commit c4ec905c9a9b68e99f5abf208be53c981cd718eb

* lisp/hi-lock.el: More fixes related to revert-buffer.

(hi-lock-set-pattern): Use the same propertized string
for 'overlay-put' property to allow 'remove-overlays'
to remove it while using 'eq' on the property value.
https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg01001.html

(cherry picked from commit bf862fc277034b6ada4a4a81dd640e116e6b9312)

Update to Org 9.7.5-9-ga091ca

(cherry picked from commit 6cc8ffae9a6fa3bbdc71bf5eac3875000c9e7870)

; Fix typo in lua-ts-mode.el

* lisp/progmodes/lua-ts-mode.el: Fix typo.  (Bug#71736)

(cherry picked from commit c477443ab80a087a94c357f3fe5fd62c97e6f6ab)

; Add 'eglot-ensure' option to 'lua-ts-mode-hook'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-hook): Add an option to
enable Eglot from the lua-ts-mode-hook.  (Bug#71736)

(cherry picked from commit 6e5e4d6193999eef31a3c62a3de64910ccbd3ffb)

; Skip commit 58a2f36a8b93a2773dbf939ee67112897ea72944

; (completion-preview-partial-insert): Avoid no-op undo entries

* lisp/completion-preview.el
(completion-preview-partial-insert): Abort change group
rather than deleting entire temporary insertion, so as to
avoid recording no-op undo entries.  Move 'deactivate-mark'
let-binding outside of 'catch' form.

Write Antinews for Emacs 30 ELisp Reference

* doc/lispref/anti.texi (Antinews):
* doc/lispref/elisp.texi (Top): Rewrite "Antinews" for Emacs 30.

(cherry picked from commit 039e6ffd86650b26364d1fab1014e19dfcab3b21)

(eval-last-sexp): Fix bug#71774

* lisp/progmodes/elisp-mode.el (eval-last-sexp): Set `values` only
when `eval-expression-debug-on-error` is nil.

(cherry picked from commit bf8c9f702ba7cba8f835996d49cad01865e2813e)

* lisp/hi-lock.el: More fixes for revert-buffer (bug#57534)

(hi-lock-set-pattern): Put the text property 'regexp' on the lighter string.
(hi-lock-revert-buffer-rehighlight): Get the real regexp from the
text property 'regexp'.  This fixes the case when the original
regexp gets lost after e.g. 'M-s . M-s h r'.

(cherry picked from commit 6d94090cadcff1b251457c2d82b287f4beb5a93d)

* lisp/hi-lock.el (hi-lock-revert-buffer-rehighlight): Improve (bug#57534).

Instead of detecting invalidated overlays, use the same condition
as in 'hi-lock-set-pattern', and always re-highlight overlays,
because even when overlays stays on their original positions,
there is a need to highlight more matches possibly added after revert.

(cherry picked from commit 280c91782afa0c6ae667785b806da58e6be102ae)

* lisp/tab-bar.el (tab-bar-select-restore-windows): Improve the docstring.

Suggested by Kévin Le Gouguec <kevin.legouguec@gmail.com> in bug#71779.

(cherry picked from commit 339310d020587ac25798f94851834c7044c87be4)

Write Antinews for Emacs 30 user manual

* doc/emacs/anti.texi (Antinews):
* doc/emacs/emacs.texi (Top): Rewrite "Antinews" for Emacs 30.

(cherry picked from commit c1e7569a925a5ff4666d2033a979511bc950bd2f)

; * lisp/erc/erc-backend.el (erc-server-reconnect-timeout): Doc (bug#71756).

(cherry picked from commit 233f683da8fa146e3328c96b4cf04211446e026e)

; Skip commit 20a672b3b2b1c3306b26e546380f2902d10931a0

Fix two tests for --without-all build

* test/src/image-tests.el
(image-tests-image-mask-p/error-on-nongraphical-display)
(image-tests-image-metadata/error-on-nongraphical-display): xpm images
are not supported in all configurations so use xbm for non graphical
display tests.

(cherry picked from commit 6f9f9a2155542d6452847a9311772c399298c4c8)

(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef

* src/marker.c (buf_bytepos_to_charpos): Don't compare byte-positions
with char-positions.

(cherry picked from commit b595b4598e7b3dabe4d45895f5580c9a351f2885)

Change ERC version to 5.6.1-git

* doc/misc/erc.texi: Change ERCVER to 5.6.1.
* lisp/erc/erc.el: (erc-version): Change working version to 5.6.1-git.
Do the same for the package Version header.  Don't bother updating
`customize-package-emacs-version-alist' until needed.

(cherry picked from commit 253172162107b34ebd24b8fbe1db4ac10a3931bd)

; * etc/PROBLEMS (PGTK): Remove redundant 2nd PGTK section.

(cherry picked from commit 98daa10f065ad6a7f840c483b5a230fd3fbf3991)

Fix handling of non-nil 'dired-movement-style'

* lisp/dired.el (dired--move-to-next-line): Treat any non-nil
value of 'dired-movement-style' except 'cycle' as 'bounded'.
(dired-movement-style): Mention this in the doc string.
(Bug#71770)

(cherry picked from commit ced33bc23978c7e27c30a9e09bf8814f6798524f)

; * lisp/gnus/message.el (message-idna-to-ascii-rhs): Doc fix (bug#71757).

(cherry picked from commit b1e9b6fd67df1214dc01bd1b2622f141c59766f3)

; Skip commit 5eb9a0d2c79beaaca8b3ea0ee8c6b4bd5efa4bf0

Do not prematurely truncate python eldoc string

'eldoc-echo-area-use-multiline-p' is there for that.
* lisp/progmodes/python.el (python-eldoc-setup-code):
Make the change.  (Bug#71720)

* etc/NEWS: Announce the change in behavior.

(cherry picked from commit 6ec77f580ddbff9001abbc47ab2b857df41b3f36)

; Fix simple-tests as fallout of last change

* test/lisp/simple-tests.el
(simple-execute-extended-command--shorter): Fix test broken by new
kill-whole-line tests.  (Bug#65734)

(cherry picked from commit f475a1a25449509aa8c081d63f6ca63833cfdd35)

Add tests for `kill-whole-line' (bug#65734)

* test/lisp/simple-tests.el (simple-test-point-tag):
(simple-test-mark-tag):
(simple-test--set-buffer-text-point-mark):
(simple-test--get-buffer-text-point-mark): Add helper functions used by
the tests.
(kill-whole-line-invisible):
(kill-whole-line-read-only):
(kill-whole-line-after-other-kill):
(kill-whole-line-buffer-boundaries):
(kill-whole-line-line-boundaries): Add tests for `kill-whole-line'.

(cherry picked from commit aa10d0c5ac1a4d706b8562671f2a22a82f9e733b)

kill-whole-line: Honor visibility; fix kill-ring when read-only (bug#65734)

* lisp/simple.el (kill-whole-line): Use visibility state before
performing any edits as reference instead of expecting that visibility
cannot change.  First of the two calls to `kill-region' may trigger
`after-change-functions' that might alter the visibility state.
Make sure that we populate the `kill-ring' with the contents of the
whole line when buffer is in `read-only-mode'.

(cherry picked from commit 058bb4ca25adb8f4bf78cc0f09a65d730dbd797d)

* lisp/hi-lock.el (hi-lock-file-patterns-policy): Add value 'always'.

(hi-lock-mode): Update docstring.
(hi-lock-find-patterns): Return t for value 'always'.
(hi-lock-revert-buffer-rehighlight): Rewrite to correctly handle
all possible cases (bug#57534).

(cherry picked from commit e45173d114e37d5a652b5393ce7bcab1acea3f1a)

; Skip commit d6afb017debb9cc1a88a129eea688e2f2bbf402a

Prevent crashes and related issues if initial activity is destroyed on Android

* java/org/gnu/emacs/EmacsWindow.java
(EmacsWindow) <initialWindowCreated>: New variable.
(EmacsWindow): If the initial frame has not yet been created,
set attachmentToken to -1.

* java/org/gnu/emacs/EmacsWindowManager.java (registerWindow):
When the window's attachment token is -1 (i.e., it is the
default window), start EmacsActivity rather than
EmacsMultitaskActivity.  Catch exceptions around startActivity.

(cherry picked from commit 860840621a1ebe2e4f17ba8ae78d441ea75650b2)

Disable preprocessing of assembler files with m4 on non-MIPS systems

* exec/Makefile.in (is_mips): New substitution.
(.s.o): Avoid calling m4 unless it be set.

* exec/configure.ac: Substitute is_mips, and don't generate
config-mips.m4 otherwise.

* exec/loader-x86.s:

* exec/loader-x86_64.s: Use assembler rather than m4-defined
comment syntax.

(cherry picked from commit fa322155ad51e3628256232bc113ad7499ab76e7)

Improve Local Directory Variables auto-insert

* lisp/autoinsert.el (auto-insert-alist): Confirm after entering
in a non-existent mode in Local Directory Variables skeleton.

(cherry picked from commit da11a2a5cc3fa7e28031dc87e0f07004a9a005f7)

Doc fix in 'php-ts-mode'

* lisp/progmodes/php-ts-mode.el
(php-ts-mode--custom-html-font-lock-settings): Doc fix.  (Bug#71759)

(cherry picked from commit d5c6eb1f9646781cf103124fb7e88d1fa1cf2473)

Support .dir-locals-2.el in `auto-insert-mode`

* lisp/autoinsert.el (auto-insert-alist): Use Directory Local Variables
skeleton also for ".dir-locals-2.el".

(cherry picked from commit a2c3a91f0e3b6a3a22e74ef2dc473c12059e93c9)

Use 'revert-function' in *xref* buffer

* lisp/progmodes/xref.el (xref--xref-buffer-mode-map): Cease
binding 'g' to 'xref-revert-buffer'.
(xref--xref-buffer-mode): Set 'revert-buffer-function' to...
(xref--revert-buffer): ...this.  New function, renamed from...
(xref-revert-buffer): ...this.  Make it an alias of
'revert-buffer'.
* etc/NEWS: Announce it.
* doc/emacs/maintaining.texi (Xref Commands): Update docs.

(cherry picked from commit 82125b1a6616259531ef3abd45b41089de160ba7)

(quail-input-method): Fix bug#70541

* lisp/international/quail.el (quail-input-method): Don't bind
`inhibit-modification-hooks`.
(quail-point-in-conversion-region): Simplify.

(cherry picked from commit 78951610a6e9a2977008a8d5884bf1f2f8330da2)

Avoid compiler warnings in the Cygwin-w32 build

* src/w32fns.c [DEFAULT_IMAGE_BASE]: Don't define on Cygwin.
* src/cygw32.h (w32_get_resource): Add prototype.  (Bug#71786)

(cherry picked from commit fb15affde8cb27ad358ad7070d150238cec11f99)

Add new face 'widget-unselected' to wid-edit.el

* doc/misc/widget.texi (Customization): Document it.

* etc/NEWS: Announce 'widget-unselected' face.

* lisp/wid-edit.el (widget-unselected): New face.
(widget-specify-unselected, widget-specify-selected): New functions.
(widget-checkbox-action, widget-checklist-add-item)
(widget-radio-add-item, widget-radio-value-set)
(widget-radio-action): Use them.

(cherry picked from commit 8d354925ddb03781e8be96b21023393d217d3778)

Cease using etags as a default Xref backend

* lisp/repeat.el (repeat-check-map): Simplify

(tags-completion-at-point-function): Simplify autoloading

Nullify 'completion-at-point-functions' default value

Fix 'repeat-check-map'

Remove 'read-minibuffer-restore-windows'

Minor improvements to new Completion Preview commands

* lisp/completion-preview.el (Commentary): Mention
`completion-preview-partial-insert' and elaborate about
`completion-preview-insert-sexp'.
(completion-preview--barf-if-no-preview): New function.
(completion-preview-insert, completion-preview-complete):
Use it.
(completion-preview-partial-insert): Rename arg to FUN; only
compute (+ end (length aft)) once; bind 'deactivate-mark' to
nil while inserting/deleting to allow commands that use this
function to work as expected with 'shift-select-mode';
improve behavior when called with point not at the start of
the completion preview overlay (e.g. when point is in the
middle of a multi-word symbol and this function is called
via 'completion-preview-insert-word'); add the base part of
the completion candidate to when calling exit-function.
(completion-preview-insert-word): Improve docsting, rename
argument ARG to N.
(completion-preview-insert-sexp): Likewise, and also remove
second argument INTERACTIVE.
(completion-preview--active-p): Rename to...
(completion-preview-active-p): ...this.  Make this function
public so users can leverage it for their own commands.
Extend docstring to explain how to do that.

* test/lisp/completion-preview-tests.el
(completion-preview-insert-calls-exit-function)
(completion-preview-insert-word): Break long lines.
(completion-preview-insert-sexp)
(completion-preview-insert-nonsubword)
(completion-preview-insert-subword): Fix docstrings.
(completion-preview-insert-mid-symbol): New test.

(cherry picked from commit 9cb2a2040888c28587bed2b0902d9da90720f9a0)

New commands 'completion-preview-insert-{word,sexp}'

* lisp/completion-preview.el
(completion-preview-partial-insert): New function.
(completion-preview-insert-word)
(completion-preview-insert-sexp): New commands.
(completion-preview-commands): Add them.
(Commentary): Document them.
(completion-preview-active-mode-map): Add comment.
* test/lisp/completion-preview-tests.el
(completion-preview-insert-calls-exit-function): Update.
(completion-preview-insert-nonsubword)
(completion-preview-insert-subword)
(completion-preview-insert-sexp):  New tests.  (Bug#71716)

(cherry picked from commit b3017e7c252462297ee3887dd6d65cf14f138b85)

Always perform Eshell process cleanup runs in the Eshell buffer

Previously, some code executed in a timer, which could execute in the
wrong buffer, leading to a hang.

* lisp/eshell/esh-proc.el (eshell-sentinel): Use 'with-current-buffer'
in the timer function.

* test/lisp/eshell/esh-proc-tests.el (eshell-test-value): New variable.
(esh-proc-test/sentinel/change-buffer): New test.

(cherry picked from commit da4bc5c9274a6705501e24fb8f2984f5bf5fe099)

Avert crash in store_mode_line_string on Android 5.0 and earlier

* src/xdisp.c (store_mode_line_string)
[__ANDROID_API__ < 22]: Call strlen on STRING if the limit
would otherwise be SIZE_MAX, or if the address of the string
is within PRECISION bytes of UINTPTR_MAX, in which case it
cannot possibly be larger than PRECISION.

(cherry picked from commit 8b1841021c0d1ca92cb79443909824519429f75f)

Use HarfBuzz in Cygwin-w32 build

* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper) [CYGWIN]:
Use cygharfbuzz-0.dll as HarfBuzz DLL name instead of
libharfbuzz-0.dll. (Bug#71766)

(cherry picked from commit e7c85f9235af485baba6e398b4f509f14bf80b1c)

; * src/buffer.c (syms_of_buffer) <mode-line-format>: ASCIIfy.

(cherry picked from commit 8e3e206bd32c2fc4dc07ab2c6271fd0d0e8dddd9)

Fix tabbing between widgets (bug#70594)

* lisp/wid-edit.el (widget-move): Don't error when tabbing in a
buffer with only one active widget and 'widget-skip-inactive'
enabled.  Improve code by handling forward and backward movement
in a single loop.

(cherry picked from commit 2f18929319a4883575acb7440c920ad059a84105)

; * lisp/which-key.el (which-key-dont-use-unicode): Add :initialize

This fixes the change from 768e92b9, which accidentally would call
'custom-reevaluate-setting' on user options before they were registered,
initialising their default value to nil.  When the 'defcustom'
expressions were evaluated later on, they were not properly initialised
as their variables were already bound to some value (nil).

https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg00825.html
(cherry picked from commit 6ad6507532bc653c13531112e9a5467e4370929a)

* lisp/touch-screen.el (touch-screen-inhibit-drag): Another typo.

(cherry picked from commit 60b38c317bbd8e6020442a5c0efe504a22eaa092)

Support rescaling sliced images in EWW via 'text-scale-mode'

* src/xdisp.c (find_display_property): When the property value has
multiple elements, return the whole list.

* lisp/net/eww.el (eww--rescale-images): Use 'get-display-property'.

* doc/lispref/display.texi (Display Property): Describe the new
'get-display-property' behavior (bug#71741).

(cherry picked from commit 6837828219b965148219f6d8eba4c740aaddacbb)

Fix rescaling of images via 'text-scale-mode' in EWW

* lisp/net/eww.el (eww--rescale-images): Handle a :scale of 'default'
(bug#71741).

(cherry picked from commit 3abcfe013d809a8194f5158877fd43f11d714fd5)

* lisp/touch-screen.el (touch-screen-inhibit-drag): Fix typo.

(cherry picked from commit 0e43606b20d4ce1c094dfc41ee90f46517aa7419)

Fix latent side-effects of respecting field boundaries in text conversion

* src/textconv.c (textconv_query, get_extracted_text)
(get_surrounding_text): Restore selected window in addition to
excursion.
(locate_and_save_position_in_field): Restore excursion lest the
current buffer differ from the selected window's contents, to
prevent redisplay from clobbering the current buffer when called
while the current buffer is at variance with the selected
window's contents, as seen with dired-other-window.

(cherry picked from commit 1b4c56272110944c4ea1483c6f9662de9e42a07b)

; * lisp/treesit.el (treesit--syntax-propertize-start): Fix doc.

(cherry picked from commit 2ba39a30bf4fbe90b5b5e16a50dc7090a42b759b)

; * lisp/simple.el (undo-auto--boundaries): Doc fix (bug#71755).

(cherry picked from commit e4046f33ab8ff2a5a1edbba2634d52bcadf25b24)

; * lisp/language/cyrillic.el: Delete obsolete commentary (bug#71754).

(cherry picked from commit 008eeb21fdb294726a4d151929d3fff26658c8a8)

Add missing builtin package declarations

* lisp/editorconfig-conf-mode.el:
* lisp/editorconfig-core-handle.el:
* lisp/editorconfig-core.el:
* lisp/editorconfig-fnmatch.el:
* lisp/editorconfig-tools.el: Declare library as part of the
'editorconfig' package.

(cherry picked from commit 680155d3f0328a22ecce18647779e0e26931e825)

Extend treesitter tests on emba

* test/infra/Dockerfile.emba (emacs-tree-sitter): Install c-ashrp
grammar.

* test/infra/Makefile.in (TREE-SITTER-FILES): Add csharp-mode-tests.el.
(tree-sitter-files): Rename from tree-sitter-files-template.
Generate .tree-sitter-files.

* test/infra/gitlab-ci.yml (test-tree-sitter): Extend .tree-sitter-files.

* test/infra/test-jobs.yml: Regenerate.

(cherry picked from commit ce4f56caf71b24ef005c832168f92bc72b532460)

Show entries from key-translation-map in which-key mode

* lisp/which-key.el (which-key-extra-keymaps): New user option.
(which-key--get-current-bindings): Consult it.

(Bug#71648)

(cherry picked from commit 7e8a97ac7885c1f0818a713e98bedd558293bb39)

* lisp/tab-bar.el (tab-bar-tab-group-face-function): Improve doc (bug#71733).

(cherry picked from commit 4a0958642d96fcd521087dc4fa54d0701797a585)

; Fix flymake tests with GCC 14.

* test/lisp/progmodes/flymake-tests.el (included-c-header-files):
Fix test failure with GCC 14.  (Bug#71749)

(cherry picked from commit a769f171e7ebb8e30f198f4328d46f47fe7958fb)

Don't show char name for multi-char translations

I forgot about shift-translation when implementing this originally, so
this code was being triggered for things like 'C-S-<up>'.

* lisp/help.el (help-key-description): Check if the translation result
is a single char.

(Bug#71411)

(cherry picked from commit 96e27c2ecf9914cbb9d2e0824adf501082f88ef6)

Reset ls-lisp-use-string-collate when ls-lisp-emulation changes

* lisp/ls-lisp.el (ls-lisp-set-options): Add ls-lisp-use-string-collate
to the list of custom options that are reset when ls-lisp-emulation
changes.

https://lists.gnu.org/archive/html/help-gnu-emacs/2024-06/msg00135.html
(cherry picked from commit 0715abfa86acb1289074ac7647984941c71759ec)

Update to Transient v0.7.2-1-gf273c0c8

This fixes two bugs, one of them restoring compatibility with the
version that ships with Emacs 29, making emoji-insert usable again.
The other changes are of cosmetic nature.  The only exception is a new
command, whose creation lead to the discovery of one of the bugs, and
remains unused until a package author actually binds it in a prefix.
I.e., unless someone actually uses this, the risk of a regression is
close to zero, and even if it is used, it can only affect the prefix
that binds it.

(cherry picked from commit 4fcc38966bf58cc9977fc9fea0f7cec7eea30f6b)