Fix DocView's text conversion on tty Emacs

* lisp/doc-view.el (doc-view-open-text): Defaults to first page
should `doc-view-current-page' return nil.  (Bug#72305)

(cherry picked from commit 93f62f10f7b28e0ceeb1464d918746fe2b2beae1)

; Skip commit 71a4670a9fa238f920ce88b938f703b605ad2f48

; Fix last change

* src/frame.c (syms_of_frame) <frame-inhibit-implied-resize>:
* doc/lispref/frames.texi (Implied Frame Resizing): Don't use
passive voice.  (Bug#76275)

(cherry picked from commit 70b15c5174e147c25f4cf71f7c94ee72a8839393)

Optionally inhibit implied resizing while frame is made (Bug#76275)

* src/frame.c (frame_inhibit_resize): Handle new value 'force'
for 'frame-inhibit-implied-resize' (Bug#76275).
(frame_inhibit_implied_resize): New value 'force' to inhibit
implied resizing while a new frame is made.
* lisp/cus-start.el (frame-inhibit-implied-resize): Make new
value 'force' customizable.
* doc/lispref/frames.texi (Implied Frame Resizing): Describe new
value 'force' of 'frame-inhibit-implied-resize'.
* etc/NEWS: Announce new value 'force' of
'frame-inhibit-implied-resize'.

(cherry picked from commit 499da9e1a9f63d9a767a3cab1f7771799e1d3274)

Tramp: Improve doc of ad-hoc multi-hop file names

* doc/misc/tramp.texi (Ad-hoc multi-hops, Frequently Asked Questions):
Improve description how ad-hoc multi-hop file names can be made
persistent.  (Bug#65039, Bug#76457)

(cherry picked from commit 949739571ba48bcece296d805668de71b2481e82)

Enforce redisplay when deleting a child frame (bug#76406)

* src/term.c (tty_free_frame_resources): When deleting a child mark its
root frame to garbaged.
* src/dispnew.c (prepare_desired_root_row): Add a check for GLYPH_DEBUG.

(cherry picked from commit 2a756ce9d774a91774fdf4c5cd40562540a40633)

Implement new user option 'quit-window-kill-buffer' (Bug#76248)

* lisp/window.el (quit-window-kill-buffer): New option.
(quit-window): Handle it.
* doc/lispref/windows.texi (Quitting Windows): Describe new
option 'quit-window-kill-buffer'.
* etc/NEWS: Announce new option 'quit-window-kill-buffer'.

(cherry picked from commit 99410ba902a01d56b49001b4c18a5390b3c5463b)

dolist: support non-list spec

Recognize extracted functions as such

Improve imenu indexing in ELisp mode

New command 'lisp-duplicate-sexp'

* lisp/emacs-lisp/lisp-mode.el (lisp-tidy-sexp): Fix infloop.

Demote errors in 'cl-case' to warnings

elisp-mode.el: Improve Eldoc support

Fix imenu minibuffer action regression

(elisp-extract-to-local-variable): Fix off-by-one error

lisp-mode.el: A few more structural editing commands

Revert “Pacify GCC in pgtkselect malloc alignment”

Problem reported by the wurfkreuz (Bug#76414).
* src/pgtkselect.c: Revert my commit
ff65cc9944dc0b37986d512ee8b9817c6913db36 dated Sun Jan 26 22:15:49
2025 -0800 for now.  I may come up with a better commit later.

(cherry picked from commit f12fbed4c13998d4838633bfa89124685a79dae2)

; Skip commit 3a1195894e55db5c48c4a337bff5f6e58ce356f5

Fix diary not displaying some entries in european style

* lisp/calendar/calendar.el (diary-european-date-forms): Correctly
recognize times using a dot as separator.  (Bug#53702)

(cherry picked from commit 8b0043ffd609344f714ba962f82624128e662011)

; Delete out-of-date comment in float-sup.el

* lisp/emacs-lisp/float-sup.el: Delete out-of-date comment.

(cherry picked from commit dfce17103c8f91db887b490418b9bafb0f52aacb)

Mark kermit.el as obsolete

While Kermit is still developed, this Emacs support library is
essentially unchanged since it was added to Emacs, which seems to have
been in 1988.  It is also based on the old pre-Emacs 20 shell mode, so
it's not clear if it even works, and much less if it is relevant with
Kermit from this century.

There is also this modern alternative, from 1994, which seems far
more complete: https://www.kermitproject.org/archive.html#emacs

The bug tracker has stayed silent, so if anyone is still using it, they
will have to report a bug and ask us to unobsolete it.

* lisp/obsolete/kermit.el: Add Obsolete-since header.  Add link to
alternative library at kermitproject.org.

(cherry picked from commit 96e066be3d252efe44a8321be313a67def14ea4e)

Move kermit.el to obsolete/kermit.el

* lisp/kermit.el: Move from here...
* lisp/obsolete/kermit.el: ...to here.

(cherry picked from commit 29a7f63b5f374ba9cfd6f3e6c314e415bcd5936d)

; Fix documentation of recent changes

* etc/NEWS:
* doc/lispref/numbers.texi (Arithmetic Operations): Fix wording
and markup.

(cherry picked from commit 4abeb75a51634641185f80a747f9d8b3debcedd2)

Prefer ert-with-temp-directory in tests

* test/lisp/dired-aux-tests.el (dired-test-bug30624):
* test/lisp/emacs-lisp/track-changes-tests.el
(track-changes-tests--random):
* test/src/buffer-tests.el (test-buffer-chars-modified-ticks):
* test/src/fileio-tests.el (fileio-tests--symlink-failure)
(fileio-tests--insert-file-interrupt)
(fileio-tests--circular-after-insert-file-functions): Prefer
ert-with-temp-directory to using make-temp-file directly.

(cherry picked from commit 03bc51349f19899812652a8335f5055f561494e2)

Fix print-tests

* test/src/print-tests.el (terpri): Erase the buffer *terpri-test*
before individual runs.  (Bug#72334)
(print-circle): Allow circular references with number greater than 9.

(cherry picked from commit 5f1d52c43b5eafeb4938d99c275e78c9155f4142)

Fix comparison of current values for the key-sequence :type

* lisp/cus-edit.el (custom-variable-modified-p): Round-trip
the option value before comparing it against the widget's value.
This mostly fixes comparison against the obsolete key-sequence
widget, but could fix other corner cases, when the widget
accepts different types as values.  (Bug#76156)

* test/lisp/cus-edit-tests.el (cus-edit-test-bug76156)
(cus-edit-test-bug76156-2): New test options.
(cus-edit-test-unedited-option): New test.

(cherry picked from commit f549cedaa2721bfc463fe714c00016aed21f7b5c)

Improve fontification of docker-files

Add support for fontifying the following grammar-elements:
- image-declarations (image-name, image-tag & image alias)
- strings in more general terms
- string-expansion statements
- treat path-values as strings
- identifiers names for ENV and ARG statements
- argument values for ENV and ARG statements
* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode)
(dockerfile-ts-mode--font-lock-settings): Improve fontification.
(Bug#76481)

(cherry picked from commit 2044f6d9592cdec3a916c0d3c0a8a079c479db61)

Prefer incf to cl-incf in emacs-lisp/*.el

* lisp/emacs-lisp/backtrace.el (backtrace--print-func-and-args):
* lisp/emacs-lisp/bindat.el (bindat--type):
* lisp/emacs-lisp/bytecomp.el (byte-recompile-directory):
* lisp/emacs-lisp/chart.el (chart-file-count):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer, cl--print-table):
* lisp/emacs-lisp/cl-generic.el (cl--defmethod-doc-pos):
* lisp/emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation)
(common-lisp-indent-function-1, lisp-indent-defmethod):
* lisp/emacs-lisp/cl-lib.el (cl--set-substring):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
* lisp/emacs-lisp/cl-preloaded.el (cl-struct-define):
* lisp/emacs-lisp/cl-print.el (cl-print--cons-tail)
(cl-print--vector-contents, cl-print--struct-contents)
(cl-print--string-props):
* lisp/emacs-lisp/cl-seq.el (cl-substitute):
* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
(comp--range-intersection):
* lisp/emacs-lisp/comp.el (comp-vec-append, comp--gen-counter)
(comp--op-case, comp--limplify-lap-inst, comp--limplify-block)
(comp--limplify-function, comp--maybe-add-vmvar, comp--fwprop*):
* lisp/emacs-lisp/edebug.el (edebug--called-interactively-skip):
* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
* lisp/emacs-lisp/elp.el (elp--make-wrapper):
* lisp/emacs-lisp/ert-x.el (ert-kill-all-test-buffers):
* lisp/emacs-lisp/ert.el (ert--stats-set-test-and-result)
(ert-write-junit-test-summary-report):
* lisp/emacs-lisp/memory-report.el (memory-report--symbol-plist)
(memory-report--object-size-1):
* lisp/emacs-lisp/oclosure.el (oclosure--index-table)
(oclosure--define-functions):
* lisp/emacs-lisp/package.el (package-menu--perform-transaction):
* lisp/emacs-lisp/smie.el (smie-set-prec2tab, smie-prec2->grammar)
(smie-config--guess, smie-config--guess-1):
* lisp/emacs-lisp/syntax.el (syntax-propertize-rules)
(syntax-ppss--update-stats):
* lisp/emacs-lisp/track-changes.el (track-changes--after): Prefer incf
to cl-incf.

(cherry picked from commit ae37a1cc3d93d3703b43c5ab2d10f1f3e146cf90)

Prefer incf to cl-incf in tests

* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-reify-function):
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf):
* test/lisp/emacs-lisp/cl-macs-tests.el
(cl-macs-loop-for-as-arith-order-side-effects)
(cl-macs-loop-for-as-equals-then, cl-macs-loop-do, cl-macs-loop-finally)
(cl-macs-loop-in-ref, cl-macs-loop-being-elements-of-ref)
(cl-macs-test--symbol-macrolet, cl-the):
* test/lisp/emacs-lisp/cl-seq-tests.el (cl-lib-test-remove)
(cl-lib-test-remove-if-not):
* test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
(edebug-test-code-range):
* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-deduplicate):
* test/lisp/emacs-lisp/generator-tests.el (cps-while-incf):
(cps-test-iter-cleanup-once-only):
* test/lisp/emacs-lisp/hierarchy-tests.el
(hierarchy-labelfn-button-if-does-not-button-unless-condition)
(hierarchy-labelfn-button-if-does-button-when-condition):
* test/lisp/emacs-lisp/let-alist-tests.el (let-alist-evaluate-once):
* test/lisp/emacs-lisp/lisp-mode-tests.el
(indent-sexp, lisp-indent-region):
* test/lisp/emacs-lisp/map-tests.el (test-map-elt-gv)
(test-setf-map-with-function):
* test/lisp/emacs-lisp/multisession-tests.el (multi-test-sqlite-simple)
(multi-test-sqlite-busy, multi-test-files-simple)
(multi-test-files-busy):
* test/lisp/emacs-lisp/oclosure-tests.el
(oclosure-test, oclosure-test-mutate):
* test/lisp/emacs-lisp/track-changes-tests.el
(track-changes-tests--random):
* test/lisp/files-tests.el (files-tests--with-buffer-offer-save):
* test/lisp/net/shr-tests.el (shr-test/zoom-image):
* test/lisp/replace-tests.el (replace-tests-with-undo):
* test/src/buffer-tests.el (test-overlay-randomly):
* test/src/data-tests.el (test-bool-vector-bv-from-hex-string):
* test/src/fns-tests.el (fns-tests-sort):
* test/src/json-tests.el (json-insert/signal, json-insert/throw):
* test/src/minibuf-tests.el (minibuf-tests--strings-to-symbol-alist)
(minibuf-tests--strings-to-string-alist)
(minibuf-tests--strings-to-string-hashtable)
(minibuf-tests--strings-to-symbol-hashtable):
* test/src/process-tests.el (make-process/file-handler/found): Prefer
incf to cl-incf.

(cherry picked from commit 042dc5929b706b5fbc0ea8ada6014661d44a1b53)

Prefer decf to cl-decf

* lisp/auth-source-pass.el (auth-source-pass--find-match-many):
* lisp/calendar/time-date.el (decoded-time-add)
(decoded-time--alter-month, decoded-time--alter-day):
* lisp/dired.el (dired--move-to-next-line):
* lisp/dom.el (dom-pp):
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
* lisp/emacs-lisp/cl-print.el (cl-print-to-string-with-limit):
* lisp/emacs-lisp/cl-seq.el (cl-fill, cl-replace, cl-substitute):
* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
(comp--range-intersection):
* lisp/emacs-lisp/comp.el (comp-vec-prepend, comp--emit-narg-prologue):
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
* lisp/emacs-lisp/pp.el (pp--format-definition):
* lisp/emacs-lisp/smie.el (smie-config--guess-1):
* lisp/eshell/esh-io.el (eshell-close-handle, eshell-set-output-handle):
* lisp/gnus/gnus-async.el (gnus-async-prefetch-article):
* lisp/gnus/gnus-group.el (gnus-group-mark-group)
(gnus-group-yank-group):
* lisp/gnus/gnus-salt.el (gnus-tree-forward-line):
* lisp/gnus/gnus-score.el (gnus-decay-scores):
* lisp/gnus/gnus-srvr.el (gnus-browse-toggle-subscription-at-point):
* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads, gnus-parent-headers)
(gnus-update-marks, gnus-summary-work-articles)
(gnus-summary-refer-parent-article, gnus-summary-next-thread)
(gnus-read-header, gnus-summary-insert-new-articles):
* lisp/gnus/gnus-topic.el (gnus-topic-forward-topic):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-remove-first-header)
(message-shorten-references, message-insert-screenshot):
* lisp/gnus/mm-url.el (mm-url-insert):
* lisp/gnus/nnselect.el (nnselect-push-info):
* lisp/ibuffer.el (ibuffer-backward-line, ibuffer-forward-line)
(ibuffer-map-lines):
* lisp/icomplete.el (icomplete--render-vertical):
* lisp/image/image-dired-external.el (image-dired-create-thumb-1):
* lisp/image/image-dired.el (image-dired-delete-char):
* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
* lisp/minibuffer.el (minibuffer-completion-help):
* lisp/mpc.el (mpc-cmd-move, mpc-songpointer-refresh-hairy):
* lisp/net/eww.el (eww-process-text-input):
* lisp/net/pop3.el (pop3-wait-for-messages, pop3-uidl-stat)
(pop3-uidl-dele):
* lisp/net/shr-color.el (shr-color-hue-to-rgb):
* lisp/play/5x5.el (5x5-up, 5x5-left):
* lisp/play/decipher.el (decipher-read-alphabet, decipher--digram-total)
(decipher-analyze-buffer):
* lisp/play/hanoi.el (hanoi-insert-ring, hanoi-move-ring):
* lisp/profiler.el (profiler-format-number)
(profiler-calltree-build-unified):
* lisp/progmodes/antlr-mode.el (antlr-next-rule, antlr-indent-line):
* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
* lisp/progmodes/ebrowse.el
(ebrowse-cyclic-display-next/previous-member-list):
* lisp/progmodes/hideif.el (hif-backward-comment):
* lisp/progmodes/js.el (js-beginning-of-defun, js-end-of-defun)
(js-ts--syntax-propertize):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts--syntax-propertize-captures):
* lisp/rect.el (rectangle--*-char):
* lisp/term.el (term-emulate-terminal):
* lisp/textmodes/reftex-cite.el (reftex-do-citation):
* lisp/textmodes/reftex-index.el (reftex-index-next-phrase):
* lisp/textmodes/reftex-parse.el (reftex-init-section-numbers):
* lisp/textmodes/reftex-sel.el (reftex-select-unmark):
* lisp/textmodes/reftex.el (reftex-silence-toc-markers):
* lisp/treesit.el (treesit-navigate-thing):
* lisp/vc/diff-mode.el (diff-sanity-check-context-hunk-half,
(diff-sanity-check-hunk):
* lisp/vc/pcvs-util.el (cvs-first):
* lisp/vc/smerge-mode.el (smerge-get-current):
* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
* test/lisp/net/socks-tests.el
(socks-tests-perform-hello-world-http-request):
* test/src/buffer-tests.el (test-overlay-randomly): Prefer decf to
cl-defc in all code where we can.

(cherry picked from commit 9d7d4db7eb3398e754872f4c82d3d2071ae10fb2)

New macros incf and decf

* lisp/emacs-lisp/cl-lib.el (cl-incf, cl-decf): Move macros from here...
* lisp/emacs-lisp/gv.el (incf, decf): ...to here.  Make old names into
aliases, documented as deprecated.
* lisp/obsolete/cl.el: Don't alias incf and decf.

* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-test-incf)
(cl-lib-test-decf): Move tests from here...
* test/lisp/emacs-lisp/gv-tests.el (gv-incf, gv-decf): ...to here.

* doc/lispref/numbers.texi (Arithmetic Operations):
* lisp/emacs-lisp/shortdoc.el (number): Document incf and decf.

* doc/lispref/variables.texi (Multisession Variables):
* doc/misc/cl.texi (Organization, Modify Macros, Modify Macros)
(Modify Macros, Macro Bindings, For Clauses, Property Lists)
(Structures, Efficiency Concerns, Obsolete Setf Customization): Delete
cl-incf and cl-decf documentation, moving any relevant parts to lispref.
Delete some parts that seem to primarily regard implementation details
that do not warrant inclusion in lispref.  Update all examples to use
incf/decf.

(cherry picked from commit 95fee880e45184f4820e9704b75887ef2d91bd01)

Fix last commit to wid-edit.el

* lisp/wid-edit.el (widget-editable-list-entry-create): Don't
use save-excursion when indenting.  Previously, it was needed
because we inserted the :entry-format string, but we don't do
that anymore.  (Bug#53606)

https://lists.gnu.org/archive/html/emacs-devel/2025-02/msg00958.html
(cherry picked from commit 44a1c4a9aea54d6542bcf0c231b080f0ed023229)

(help--append-keystrokes-help): Fix bug#76341

* lisp/help.el (help--append-keystrokes-help): Silence the help message
when there is no help key.

(cherry picked from commit c830caab2c5bd3d03673c26f053397042dc58ad3)

* lisp/treesit.el (treesit-up-list, treesit-outline-level): Improve.

Try to get the parent parser host node that contains the
embedded parser and continue the search from it (bug#76398).

(cherry picked from commit 1ffa0521131c20edbbcba84765870f01411d039e)

Delete self-evident explanation from cl.texi

* doc/misc/cl.texi (Setf Extensions): Delete self-evident
explanation.

(cherry picked from commit ba8a1b902594189fb067c0ff5d761d19d3a2369c)

; Delete obsolete commented out parts from cl.texi

* doc/misc/cl.texi (Modify Macros, Obsolete Setf Customization): Delete
commented out documentation that is no longer true, and documentation of
a function that was removed in Emacs 24.3.

(cherry picked from commit 4aae820a017faab47662d0fa82cb5e39d8728d8c)

Make 'text-property-default-nonsticky' buffer-local when set

* src/textprop.c (syms_of_textprop)
<text-property-default-nonsticky>: Make buffer-local when set.
(Bug#76445)

* etc/symbol-releases.eld: Add text-property-default-nonsticky.

* etc/NEWS:
* doc/lispref/text.texi (Sticky Properties): Document the change.

(cherry picked from commit 827a91dbf3a45d6c3c620545b5e620ce76e44bb2)

Expand tests for cl-incf and cl-decf

* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-test-incf)
(cl-lib-test-decf): Expand tests.

(cherry picked from commit 8b6797fa01bf8c8c64bd1f72c1e2475bf2331ad9)

; Skip commit 72d7f1922611e01d01fbe407a577ab95afb0ddd7

; Fix typos

(cherry picked from commit 702cb123faf1bdbacf555188ae4997d6be3765fe)

recentf.el: Add verbosity option

* lisp/recentf.el (recentf-show-messages): New defcustom to
control verbosity.
(recentf-save-list): Use that to control verbosity.  (Bug#67946)

(cherry picked from commit ce28916282800b2e4a5f8e244616e25f9e81831a)

* lisp/net/tramp-sh.el (tramp-find-executable): Fix check.

(cherry picked from commit e682fd2d5ba5f471a6e4d07b7f691a1ba9fa1139)

; Skip commit f0d58d976a62b92bdcfe0bebdfe81c7f463fb938

; Skip commit 9a4b9a1e65857422b4c3f3ff27f21a46a30356c2

; Skip commit ecb7ad1a9aa9b98e7d582c0c9769a1ae0c52a78b

; Skip commit 26bd9f61f43c6898f5b143fae8f9d10150c1ba64

; * admin/authors.el (authors-aliases): Add Vladimir Nikishkin.

(cherry picked from commit 9c1d13c89a94685c0d1120d15e28bfb24e9644c3)

; Fix saveplace-tests for MS-Windows

* test/lisp/saveplace-tests.el
(saveplace-test-load-alist-from-file): Fix test for MS-Windows.

(cherry picked from commit 456c52978c505ce09467564cda3db30d3d38197c)

Inhibit "Wrote" message in saveplace.el when non-interactive

* lisp/saveplace.el (save-place-alist-to-file): Tell 'write-region'
to be quiet when called non-interactively.  This is in harmony with
'savehist-save'.  (Bug#76267)

(cherry picked from commit 8f45cbdee45317faa978732fa5311c3c056b559f)

Make yank-media auto select the best mime type

* lisp/yank-media.el (yank-media-preferred-types): Add new
variable that holds the list of mime types in order of their
preference.
(yank-media-autoselect-function): Add new variable and function
to choose the most preferred media type.
(yank-media): Make 'yank-media' choose the most preferred mime
type by default.
* doc/emacs/killing.texi (Clipboard):
* doc/lispref/frames.texi (Yanking Media): Document the new
behaviour, and the new variables.
* etc/NEWS: Announce the change.  (Bug#75116)

(cherry picked from commit 0ee50a3420fb8df8f3477dac610dcd53c633fff5)

Speed up widget creation (Bug#53606)

* lisp/wid-edit.el (widget-default-create, widget-checklist-add-item)
(widget-radio-add-item, widget-editable-list-entry-create): Don't
insert format escapes into the buffer, only to delete them after.
This avoids calls to delete-char and makes widget creation about 3
times faster.

(cherry picked from commit 3e269371507ea4cd7e933e39320d258a3b98de44)

; * INSTALL.REPO: Minor copyedits.

(cherry picked from commit 443df12eddc66f4e2dbb14113b868f12419508bc)

* admin/check-doc-strings: Reduce false positives.

(cherry picked from commit 79ab873b9b679ec0aedb03ce246035d8e5d4b09c)

Use .pem extension for client certs in ERC docs

* doc/misc/erc.texi (Connecting): Change file-name extensions to .pem in
all examples, and explain that the key and the cert can be combined into
one file.
(SASL): Use .pem extension for certs.
* lisp/erc/erc.el (erc--warn-once-before-connect): Revise doc.
(erc-tls): Use .pem extension for certs.  (Bug#76278)

(cherry picked from commit 1f60f86af5edba45a7d59f45ca174f6c288dde3f)

Don't kill window buffer in erc--split-line

* lisp/erc/erc-backend.el (erc--split-line): Restore original window
buffer before killing temp buffer.  (Bug#76404)

(cherry picked from commit 1270e6aec5ff4b6f420d132a2249bb94095a3f11)

Delete note on Emacs 19 modes from comint.el

* lisp/comint.el: Delete note on how to convert pre-Emacs 20 modes to
use comint.el.  Emacs 20 was released in 1997, so it's safe to assume
that any relevant code has been updated in the last three decades.

(cherry picked from commit 4ece0e2e46b1eeb315b9ebcdcee09679319128f9)

Fix identation in csharp-mode.el

* lisp/progmodes/csharp-mode.el (csharp-ts-mode--indent-rules): Fix
indentation for using statements and multiline lambdas.  (Bug#75883)
Patch based on bug report by Dino Chiesa <dpchiesa@hotmail.com>.

(cherry picked from commit ecddc8227d9be8283d9bb47639a61c888a036896)

New user option checkdoc-allow-quoting-nil-and-t

* lisp/emacs-lisp/checkdoc.el (checkdoc-allow-quoting-nil-and-t):
New user option that allows turning off the warning for having nil
and t in quotes.
(checkdoc-this-string-valid-engine): Use above new option.

(cherry picked from commit 8d4feb214b7eb802fec34269de11d30b9382cd83)

; Delete superfluous comment

(cherry picked from commit e7a35dac2fbe5777df531690c770b99e5f7561bb)

Prefer defvar-keymap in admin/gitmerge.el

* admin/gitmerge.el (gitmerge-mode-map): Prefer defvar-keymap.

(cherry picked from commit 3c93085650762c04ae3988dedc6b872b7f217143)

; Skip commit c24a142657bd025b111d089d7f79d8e4ace918c7

Use a persistent directory as default directory in diff

* lisp/vc/diff.el (diff-no-select): Use `temporary-file-directory'
as default directory.  Set default file permissions temporarily to
#o600.  (Bug#69606)

(cherry picked from commit ae439cc1b9f428a8247548f4ef3b992608a3c09b)

; Don't fail image tests if jpeg is supported via imagemagick

* test/lisp/image-tests.el (image-supported-file-p/optional):
Consider also the imagemagick case.  (Bug#76465)

(cherry picked from commit 76b938fc1d24b9dcc0c50db1dc520fbdacc19a16)

; Skip autorevert test when notify support is missing

* test/lisp/autorevert-tests.el
(auto-revert-test07-auto-revert-several-buffers): Skip if file
notification support is not available.  (Bug#76459)

(cherry picked from commit f8ff9592be9181465740ee98b71513cdbcafc35f)

; Skip shr-test/zoom-image test if png or libxml support is missing

* test/lisp/net/shr-tests.el (shr-test/zoom-image): Skip if png
images or libxml are not supported.  (Bug#76464)

(cherry picked from commit 230ecb1e273e3fec6400cfad76e9b13f648d9055)

; Skip image type test if support is missing

* test/lisp/image-tests.el (image-type-from-file-name): Skip if
image types are not available.  (Bug#76462)

(cherry picked from commit cc51bd569874cd89a7fa1c3241033e69a5c2dd01)

New variable 'treesit-aggregated-outline-predicate' (bug#76398)

* doc/lispref/modes.texi (Outline Minor Mode):
Add 'treesit-aggregated-outline-predicate'.

* lisp/treesit.el (treesit-aggregated-outline-predicate):
New buffer-local variable.
(treesit-outline--at-point):
Use 'treesit-aggregated-outline-predicate'.
(treesit-closest-parser-boundary): New function.
(treesit-outline-search): Use 'treesit-aggregated-outline-predicate'
and 'treesit-closest-parser-boundary'.
(treesit-outline-level): Use 'treesit-aggregated-outline-predicate'.
(treesit-major-mode-setup): Add 'treesit-aggregated-outline-predicate'.

* lisp/textmodes/html-ts-mode.el (html-ts-mode--outline-predicate):
Improve.

* lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode):
Set 'treesit-aggregated-outline-predicate'.

(cherry picked from commit 840be8a7d8e7db8ad7f186678226ac51712724ab)

* configure.ac (BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER): Correct test.

(cherry picked from commit f3212fa420c17710a160bc8e762e6e19871f10a3)

Fix reported Haiku build error in emacs-30.1-rc1

* src/haiku_support.cc (keysym_from_raw_char): Don't define
duplicate cases on the previous release.

(cherry picked from commit 25ba2536091dea39c690169784fa9771296eefec)

Have 'submit-emacs-patch' insert maintainers into X-Debbugs-Cc

* lisp/mail/emacsbug.el (submit-emacs-patch): Go through all files
mentioned in the diff and check for maintainers.
(submit-emacs-patch-excluded-maintainers): Add constant.  (Bug#69646)

(cherry picked from commit 4411d0de1d5cbf308440982084ad7e15a18efaf2)

; Skip commit 92e96a117525885bc2c725600aca3683e4b28b7a

; Skip commit 5e9c027e2048547f7d368da4f7da4331bc7afd73

; Skip commit f255b8854a352bf2c29ec4f83e5fae998ec38a1e

; Skip commit 3515ff95bced8915cad7dc48666034627e5fb43f

; Skip commit 375c3622e2dac090c62d99baaaac1314f6c9c5e7

Few new elisp-mode commands

scope.el: Improve seq-let handling

Better help-echo for condition symbols

Make 'electric-pair-mode' buffer-local

; Skip commit 5d5736ca75397ce0b3ab0d58e40b0489f876618a

* src/fns.c (Fmapconcat): Faster fast-path condition

(cherry picked from commit b481fbe92f793bae2ccd9d2d4efdaf0549390a41)

; Spelling fix in comment.

(cherry picked from commit 241e8e5fcf8b4624dc39890a8749f7574a8a6398)

; Skip commit 57c1df8baed6692983db77c10eab4b2c2ad00ce3

Fix signal when first enabling Custom-mode on non-GUI builds

* lisp/cus-edit.el (Custom-mode): Define tool-bar-map if not
bound and elaborate why this must be arranged.

(cherry picked from commit afd088bd608c0c27f676bbc34a5d596df3db14a1)

Fix set-time-zone-rule on DJGPP

* lisp/loadup.el ("tooltip"): Load even on MS-DOS.

* src/timefns.c (tzvalbuf): Don't define on MS-DOS.
(emacs_getenv_TZ, emacs_setenv_TZ) [MSDOS]: Call getenv and
putenv rather than overwrite existing environment storage to
update DJGPP's environment modification counter.

(cherry picked from commit 1c49cfc711c61e683bda8d5b2546b586e5168706)

; * src/pdumper.c (Fdump_emacs_portable): Fix typo in comment.

(cherry picked from commit b65971b2c06d34c268b2b0280056e478dbc31586)

; Skip commit 1468190e11b7eed49a024ffbff3da2bca21862bc

Port to modern GCC and pdumper on MS-DOS

* config.bat (mvOk): Protoize.
(djgppOk): Include sys/version.h for _DJGPP_MINOR.

* lisp/loadup.el: If system-type is ms-dos, dump bootstrap-emacs
as b-emacs.dmp.

* msdos/INSTALL: Document new versions of tools that have been
verified successfully to compile Emacs.

* msdos/emacs.djl: New linker script that arranges to link
symbols in `.subrs' in a contiguous part of data, as the DJGPP
runtime appears to treat any non-data and non-text section as
allocatable.

* msdos/mainmake.v2 (install): Install emacs.dmp alongside
emacs.exe.

* msdos/sed1v2.inp (CFLAGS): Define to -O2 -g3.
(LDFLAGS): Provide the said linker script.
(HAVE_PDUMPER): Define to yes.
(UNEXEC_OBJ, PAXCTL_dumped, PAXCTL_notdumped): Delete.
(DUMPING): Set to pdumper.
(MAKE_PDUMPER_FINGERPRINT): Don't erase this variable.
Don't stubify or set minstack.  Remove native-comp specific
directives.  Don't remove temacs prior to copying and replace
`pdmp' extension with DOS-conformant `dmp'.

* msdos/sed2v2.inp (HAVE_UNEXEC): Remove definition.
(HAVE_PDUMPER): Define to 1.

* msdos/sed6.inp (top_srcdir): Define appropriately.

* msdos/sedlibmk.inp (HAVE_BLKCNT_T): Define to 1.

* src/emacs.c (load_pdump) [MSDOS]: Use `dmp' suffix.

* src/pdumper.c (Fdump_emacs_portable) [MSDOS]: Replace ".pdmp"
suffixes with ".dmp".

(cherry picked from commit c22957c4bf7dd25857a44946169c4818996a49d9)

Prefer defvar-keymap in conf-mode.el

* lisp/textmodes/conf-mode.el (conf-mode-map): Prefer defvar-keymap.

(cherry picked from commit 89f9377139c336dd646335352b0c7480c7e19c4a)

Simplify Tramp's find-executable

* lisp/net/tramp-cache.el (with-tramp-saved-connection-property):
Fix typo.

* lisp/net/tramp-compat.el: Add TODO.

* lisp/net/tramp-sh.el (tramp-find-executable): Simplify, using
"type -P ...".
(tramp-set-remote-path): Better handling of superlong $PATH.
(tramp-get-remote-path): Adapt/use connection properties.

* test/lisp/net/tramp-tests.el (tramp--test-enabled)
(tramp-test03-file-name-host-rules): Don't wrap
`tramp-cleanup-connection' with `ignore-errors'.

(cherry picked from commit ec34bccfee68a521e7a98ce8dce9325a146d095b)

Fix remaining Android bugs reported over the past months

* java/org/gnu/emacs/EmacsActivity.java (attachWindow):
Guarantee that child windows promoted to toplevels receive
layout parameters that direct them to receive their parents'
dimensions.  Otherwise, the size of the window as a child is
retained on Huawei HarmonyOS 4.2 and possibly other Android
distributions.

* java/org/gnu/emacs/EmacsService.java (updateCursorAnchorInfo):
Run anchor updates on the UI thread, as
`InputMethodManager#updateCursorAnchorInfo' is liable to call
`View#requestLayout'.

* java/org/gnu/emacs/EmacsView.java (onMeasure): Always call
`measureChildren', or child frames' onLayout handlers might not
be invoked after they request a layout cycle and are duly
processed in `onLayout'.
(swapBuffers): Delete erroneous commentary.

* java/org/gnu/emacs/EmacsWindow.java (viewLayout): If
overrideRedirect, don't inadvertently clear rect.left and
rect.top by recording the window's WM window-relative position.
Fix typos.
(reparentTo): Invalidate focus after transferring frame.
(translateCoordinates): Account for override-redirect windows.
Mostly important for mouse-drag-and-drop-region.

(cherry picked from commit ded77feffface0c167edacf0d807273f3d4878db)

* lisp/subr.el (read-key): Add 'tab-line' (bug#76408).

(cherry picked from commit 0c8abe8bb5072c46a93585cb325c249f85f3d9c2)

Don't call x-popup-function for non-tty frames

* src/menu.c (x_popup_menu_1): Don't call x-popup-function for non-tty
frames
(syms_of_menu): Remove Qx_popup_menu_function because unused, extend doc
string of x-popup-menu-function.

(cherry picked from commit 23bf94a0111474419ca84145c8ede95c6915bd35)

Properly move existing tooltips on Android

* java/org/gnu/emacs/EmacsWindow.java (requestViewLayout): If an
override redirect window, additionally notify the window manager
of layout changes.

(cherry picked from commit e97be722d392056b6ef9e47664273ee2ca7df374)

; Skip commit 0cf3d3415224204c82efda373ffc7055163b1893

Handle nil top frame (bug#76410)

* src/frame.c (do_switch_frame): Don't assume that top_frame is always a
frame, it can be nil.

(cherry picked from commit 1194ebe3a71f97b0ce7c8dcc4edaf7b0f81fdc6f)

(json-pretty-print): Rework a bit

* lisp/json.el (json-pretty-print): Call 'replace-buffer-contents'
separately for each json object rather than once at the end, so
its work is easier.  Use 'json--print' rather than 'json-encode' so as
to avoid creating yet more temp buffers.

(cherry picked from commit 9143c18ae4752cef8465579dcd713db2032ab045)

; Skip commit bb45d35ea7db5dc93a7856dccf14c01f01bd95fe

Don't insist on the presence of a mouse in strokes-mode

* lisp/strokes.el (strokes-mode): Don't test `display-mouse-p',
as the presence of a mouse may vary over the course of an Emacs
session.

(cherry picked from commit d05894f82d90c6d739aa3d424651fda2c86f68ec)