* src/image.c (gui_put_x_image): Avoid memory leak.

(cherry picked from commit 23549d7175108ca632375f9cc4390ff3e53e4d1e)

; * doc/misc/use-package.texi (Getting Started): Fix wording.

(cherry picked from commit cb633820c151c9cf428a88f43b0a62f185c4f587)

Adapt last change to non-NS systems

* src/image.c (xpm_load_image): Also check whether mask_img is
NULL.

(cherry picked from commit 3a76354e092f291037367b65b24c1963fd0fe31f)

Fix NULL pointer dereferences in xpm_load_image

* src/image.c (x_destroy_x_image): Correct test condition.
(xpm_load_image): Do not release image data if it is still to be
created.

(cherry picked from commit b5543c54bf08c4fa4cae6b7f404a37a2aee60cdf)

Fix bug#72255

* src/image.c (struct image_type): Minor grammatical
corrections.
(image_destroy_x_image): [HAVE_NS]: Do not release
Emacs_Pix_Containers, which are identical to Emacs_Pixmaps and
consequently always released with the `struct image'.
(bug#72255)

(cherry picked from commit 1ee8579eb7d7aae9405f33099559ac8205a59be2)

Delete redundant "a.k.a." in use-package.texi

* doc/misc/use-package.texi (Getting Started): Delete redundant
acronym "a.k.a.".  (Bug#66350)

(cherry picked from commit 05629d3af0acc74b197f00504eae544081b32020)

* lisp/isearch.el: Exit Isearch after deleting the frame (bug#41338).

(isearch-mode): Add 'isearch-done' to 'delete-frame-functions'.
(isearch-done): Remove 'isearch-done' from 'delete-frame-functions'.

(cherry picked from commit 19a18e487b8e2f0c1627b9cc98e601327e884eb2)

* lisp/isearch.el: Preserve original value of overriding-terminal-local-map.

(isearch--saved-local-map): New variable (bug#72229).
(isearch-mode): Set isearch--saved-local-map to
overriding-terminal-local-map.
(isearch-done): Set overriding-terminal-local-map back to
isearch--saved-local-map.
(isearch-mouse-2): Let-bind overriding-terminal-local-map to
isearch--saved-local-map.
(isearch-done): Move comment intended to be docstring to docstring.

(cherry picked from commit 6760cedc5e0e8dc2a49d3d13e54f5f153df5a3d0)

Document (use-package 'emacs) declarations

* doc/misc/use-package.texi (The @code{emacs} package): New
node.  (Bug#66350)

(cherry picked from commit c7609464f701775088184bbfc61907cd9276437c)

; Skip commit de9f9add1383c6154805ad4b3738af4c896522e4

; * src/xdisp.c (Fformat_mode_line): Doc fix.

(cherry picked from commit 7588e1f8a9fc95a199a2a32242b5224021a44458)

Fix disappearing bar cursor on Hebrew text (bug#72230)

* src/nsterm.m (ns_draw_window_cursor): Compute the correct bar cursor
rectangle for R2L before setting the clipping.

(cherry picked from commit 2074e94c3b1800b795c11658f35fc30e74ecfb60)

Fix DocView with DVI files

* lisp/doc-view.el (doc-view-pdf/ps->png): Use
`doc-view-pdf->png-converter-function' for DVI files, too, since they
are converted to PDF earlier.

(cherry picked from commit 1aaadc8aec5272d453b996ca4b4761f3da6a17db)

; Fix typo in use-package.texi

* doc/misc/use-package.texi (Getting Started): Fix typo.
Problem reported by GitHub user Paul Jensen (psnj) in:
https://github.com/jwiegley/use-package/pull/1070/

(cherry picked from commit c1382257aa8b46286ddfc85817957543a90958b7)

FIx spurious fontification of variable in Java Mode

This fixes bug#72126.

* lisp/progmodes/cc-engine.el (c-forward-<>-arglist): Remove
tentative type identifier from c-record-type-identifiers should
it turn out not to be a type.

(cherry picked from commit caf7426f0ca280b7cf40736e595cad8f7361152f)

Correctly typeset nil and t in texinfo

* doc/emacs/package.texi (Fetching Package Sources):
* doc/lispref/display.texi (Image Descriptors):
* doc/lispref/windows.texi (Buffer Display Action Alists):
* doc/misc/gnus-faq.texi (FAQ 5-4): Correctly typeset nil and t.

(cherry picked from commit 9b426e15abd320f9c53692bb6f5834967e6e1a37)

Fix Tramp IPv6 handling in tests

* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Improve message.

* lisp/net/tramp-integration.el (shortdoc): Add further examples of
`file-remote-p'.

* lisp/net/tramp.el (tramp-handle-file-remote-p): Extend docstring.

* test/lisp/net/tramp-tests.el (tramp-test02-file-name-dissect)
(tramp-test02-file-name-dissect-simplified)
(tramp-test02-file-name-dissect-separate): Extend tests.
(tramp-test06-directory-file-name)
(tramp-test26-file-name-completion)
(tramp-test26-interactive-file-name-completion): Better handling
of IPv6 hosts.

(cherry picked from commit f050b9c5033ef92ac299d3da30774bc228fd0e08)

Update to Org 9.7.8-5-gfdf0e0

(cherry picked from commit 46b192c04b162519a5e88bbf0f465a7c5e1171a9)

Fix Ftreesit_parser_create

* src/treesit.c (Ftreesit_parser_create): Use the buffer given by the
caller rather than the current buffer.

(cherry picked from commit 87f41b937bc06a14b3aeb12d5bf1a8b3e2ff74a1)

Improve treesit-node-child-by-field-name docstring

* src/treesit.c (Ftreesit_node_child_by_field_name): Improve docstring.

(cherry picked from commit c66bda1a19afd7d8391765e2ed207e44107d8a50)

Minor copyedits in tree-sitter starting guide

* admin/notes/tree-sitter/starter-guide: Minor copyedits.
Reflow some paragraphs.

(cherry picked from commit 85773ab9771d4a382c6313803d0ffb91d379e86d)

Update tag for prebuilt tree-sitter grammars

* admin/notes/tree-sitter/starter-guide: Update tag for prebuilt
tree-sitter grammars to point to 2.4.

(cherry picked from commit 2dacec1609a2858ad932fb766d2fb77e3bdeb23f)

Fix punctuation and doc style in treesit.c

* src/treesit.c (Ftreesit_parser_included_ranges)
(Ftreesit_query_capture, treesit_traverse_sibling_helper)
(treesit_traverse_match_predicate): Fix punctiation and documentation
style in comments and docstrings.

(cherry picked from commit 68615a386699f8e6108cb294a2cbc5664948af39)

; Fix punctuation in docs

(cherry picked from commit 00adee897ac95912cb9ad6bd8a8d161db71945ac)

Fix DocView with PostScript files

* lisp/doc-view.el (doc-view-set-up-single-converter): Produce PNG
from PS in a file with ".png" extension.  (Bug#72193)

(cherry picked from commit ab29b28d4ba58642f467fc15085ad8f7485fd90d)

(kubed-command-line-completion-table): Also complete file names

New command 'kubed-kubectl-command'

New command 'kubed-transient-create'

kubed.el: Add global prefix keymap

kubed.el: Add per-resource prefix keymap

kubed-transient.el: New file

Specialize 'kubed-create-deployment'

kubed.el: New command 'kubed-namespaces-set'

(kubed-current-namespace): Fix handling of multiple contexts

(kubed-pods-shell): Bind to lowercase "s", use per-pod buffer

kubed.el: Fix quoting in update command

crm.el: Workaround issue with nil completion table

crm.el: Fix addition of input to empty history list

kubed.el: Fix "D" command in resource list buffers

Better reproduce mouse event coalescence during touch event translation

* lisp/touch-screen.el (touch-screen-handle-touch): Save the
confines of the current mouse glyph before initiating simple
translation.

(cherry picked from commit f521235656040dbae8406682976233f771c0c81c)

Don't highlight matches in dired query-replace commands

* lisp/dired-aux.el (dired-do-query-replace-regexp)
(dired-do-replace-regexp-as-diff)
(dired-do-find-regexp-and-replace): Turn off lazy highlighting
when reading the regexp from the user to avoid highlighting
regexp matches in the dired buffer. (bug#72147)

(cherry picked from commit cc6324d9dca662ea0ca9439411f4852b85e18986)

* src/comp.c (obj_to_reloc): Use eassume.

(cherry picked from commit 1519c758a5a62b10f355097b066f4b88d3762bc4)

; * lisp/net/kubed.el (kubed-create): DRY

Slightly simplify 'kubed-define-resource'

; Update ldefs-boot.el

Use SBYTES instead of strlen in treesit.c

* src/treesit.c (treesit_ensure_query_compiled)
(Ftreesit_node_child_by_field_name, treesit_initialize_query):
Use SBYTES instead of strlen.

(cherry picked from commit d995429e7bc2bc5b5d87db45dbbaca121f8118e5)

Prohibit unbinding of built-in variables

* src/data.c (set_internal): Signal error if a BLV with a
redirect or a forwarded symbol is being unbound.

* test/src/data-tests.el (binding-test-makunbound-built-in): New
test.

(cherry picked from commit da0165a01e01dcb4334feee03b462ac09ceb0f8c)

Fix segfault when deleting tree-sitter query (bug#72238)

* src/treesit.c (treesit_delete_query): Only delete query and cursor
when they are non-NULL.

(cherry picked from commit 4868a17396b6796b77285a3608b383aac32aee4f)

Add link to commit compatibility function handles

* lisp/progmodes/typescript-ts-mode.el
(tsx-ts-mode--indent-compatibility-b893426): Add link to GitHub.

(cherry picked from commit ccb856189f483abfaa584f428b09a863f816a040)

Improve one test (bug#71998)

* test/lisp/progmodes/typescript-ts-mode-resources/indent.erts (Name):
Add pre-indent state.

(cherry picked from commit bb0f0c04a3985649f8ef86d9c3cbe68b78bee1aa)

; Minor whitespace fix

*
lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--font-lock-settings):
Tabs to spaces.

(cherry picked from commit 810be9cf863ecf74d6ca649ce38450a44ae55719)

Signal error on wrong typescript dialect

*
lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode-wrong-dialect-error):
New error.

*
lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--check-dialect):
Helper function.

*
lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--indent-rules,
tsx-ts-mode--font-lock-compatibility-bb1f97b,
tsx-ts-mode--font-lock-compatibility-function-expression,
tsx-ts-mode--font-lock-compatibility-function-expression,
typescript-ts-mode--font-lock-settings): Use the new helper.

(cherry picked from commit 7a059ed88a13d660cc5eb20f5fa6a2903ed23247)

; Fix typo

* lisp/treesit.el (treesit-ready-p): Minor typo fix.

(cherry picked from commit cdca1ba2e9dbbe2bb469c91179cdda4fd4585bb0)

* lisp/progmodes/go-ts-mode.el (go-ts-mode-build-tags): Fix :version.

(cherry picked from commit 5c08fd80d27c61512d1f3f5cf9c38e2d5c3a5c18)

Add commands to run unit tests in 'go-ts-mode'

* lisp/progmodes/go-ts-mode.el (go-ts-mode-build-tags): New variable.
(go-ts-mode-map): Add new bindings.
(go-ts-mode--get-build-tags-flag, go-ts-mode--compile-test)
(go-ts-mode--find-defun-at, go-ts-mode--get-function-regexp)
(go-ts-mode--get-functions-in-range)
(go-ts-mode--get-test-regexp-at-point)
(go-ts-mode-test-function-at-point, go-ts-mode-test-this-file)
(go-ts-mode-test-this-package): New functions.

* etc/NEWS: Mention the change.

(Bug#70939)

(cherry picked from commit f249c81f868e8fea9d2a05ce258b3ebefba6620f)

; Fix recent changes in pdumper.c

* src/pdumper.c (dump_treesit_compiled_query, dump_vectorlike):
Minor copyedits.

(cherry picked from commit e63fa29b98f3be18b7c66c9ca289e787b172ec37)

Fix bool vector length overflow

* src/alloc.c (make_clear_bool_vector): It’s now the caller’s
responsibility to make sure the bool vector length is in range.
Add an eassert to double-check this.  This lets some locals be
ptrdiff_t not EMACS_INT.
(Fmake_bool_vector, Fbool_vector):
Check that bool vector lengths are in range.
* src/lisp.h (BOOL_VECTOR_LENGTH_MAX): New macro.
(bool_vector_words, bool_vector_bytes): Avoid undefined
behavior if size == EMACS_INT_MAX - (BITS_PER_BITS_WORD - 1).
This is mostly theoretical but it’s easy to do it right.
* src/lread.c (read_bool_vector): Use EMACS_INT, not just ptrdiff_t.
Check that length doesn’t exceed BOOL_VECTOR_LENGTH_MAX.
This fixes an unlikely integer overflow where the calculated size
went negative.

(cherry picked from commit 515e5ad0de133f0a3d501bd6290ccc51d8462955)

Change list-length intptr_t to ptrdiff_t

* src/fns.c (list_length, Fsafe_length, Fproper_list_p):
Use ptrdiff_t not intptr_t for accumulator, since result is ptrdiff_t.
This fixes a minor glitch in 2019-01-11T05:35:31!eggert@cs.ucla.edu
where I removed unnecessary overflow checks but forgot to change types.
This change should alter generated code only on oddball platforms where
ptrdiff_t is narrower than intptr_t, e.g., CheriBSD.

(cherry picked from commit 76497a01425e19a6c3a02c1e3031061fa0e7885b)

; * lisp/eshell/esh-io.el (eshell-close-handles): Fix version annotation.

(cherry picked from commit 55fefe06ef00cbe3e27a111a229a2622ae487c74)

Support dumping tree-sitter query (bug#69952)

Previous commit allows Emacs to dump tree-sitter queries by simply
dumping the query string and language symbol, and left the query object
and cursor object as NULL.  This commit makes sure Emacs doesn't crash
when loading the dumped query, by make sure Emacs can handle the case
where the cursor is NULL.

* src/treesit.c (make_treesit_query): Initialize query with null cursor.
(treesit_ensure_query_cursor): New function.
(treesit_initialize_query): Ensure cursor is non-null.
* src/treesit.h (Lisp_TS_Query): Update documentation.

(cherry picked from commit 1abf3bdd7edcd405d4ccb4ef4de38068348f4b95)

Support compiled queries in pdump by dumping source (bug#69952)

* src/pdumper.c (dump_vectorlike): Dump compiled queries.
* src/pdumper.c (dump_treesit_compiled_query): New function.

(cherry picked from commit 1eca867e1b60acef7f4343bc5c70340de58f1079)

SAFE_ALLOCA fixes

* src/comp.c (declare_imported_func, emit_simple_limple_call)
(declare_lex_function, compile_function):
* src/emacs-module.c (funcall_module):
* src/fns.c (Fstring_distance):
* src/font.c (font_sort_entities):
* src/haikumenu.c (digest_menu_items, haiku_menu_show):
* src/pgtkselect.c (Fpgtk_register_dnd_targets):
* src/xfns.c (Fx_begin_drag):
* src/xmenu.c (x_menu_show):
* src/xterm.c (x_dnd_compute_toplevels, handle_one_xevent)
(x_term_init):
Prefer SAFE_NALLOCA to doing size multiplication by hand, to catch
unlikely integer overflows.
* src/comp.c (emit_simple_limple_call): Fix bug where
SAFE_FREE was called too early, leading to unlikely
use of freed storage.
* src/xterm.c (handle_one_xevent): Remove side effects
from SAFE_ALLOCA args, as the args are evaluated twice.

(cherry picked from commit 101ec1430128a0b1d9e7d54cbd9c0add8f446f25)

; Fix typo in xfont.c

* src/xfont.c (xfont_list): Subtract 9 from name, not 10 + 1.

(cherry picked from commit 301b97eb24ad280bdf36f562d5a95e9aff7f4a65)

Avoid magic values in xfont_list

* src/xfont.c (xfont_list): Avoid magic values.

(cherry picked from commit 2f875ead59abe16c4559d26883ff1db524fa22f7)

Fix bibtex validation for non-file buffers

* lisp/textmodes/bibtex.el (bibtex-validate): Use buffer name
to show errors in non-file buffers.  (Bug#71946)

(cherry picked from commit 816c53c2d9d6f2aabffdced23d10a0c902193235)

; Skip commit ab7c40ea52a1db0cfc8b6605363f4e1378c9b471

; * doc/misc/gnus.texi (Agent Caveats): Fix doc

* doc/misc/gnus.texi (Agent Caveats): Change doc due to commit
2020-10-16 "Add a new variable to control Gnus Agent caching"
(41d220dc6085, bug#43356).  (Bug#72134)

(cherry picked from commit ea30ffc52b3297b4fbefa1fd591b8d0eece5bfc6)

; * src/sqlite.c (Fsqlite_load_extension): Add "vec0" to allowed extensions.

(cherry picked from commit 07b1a36f78c33d111da9a59d6f92ee6d0395d816)

Avoid accessing uninitialized bool_vector words

Although loading uninitialized works from memory and then ignoring
the result works fine on conventional architectures, it
technically has undefined behavior in C, so redo bool_vector
allocation so that the code never does that.  This can improve
performance when allocating large vectors of nil, since calloc can
clear the memory lazily.
* src/alloc.c (make_clear_bool_vector): New function,
a generalization of make_uninit_bool_vector.
(make_uninit_bool_vector): Use it.
(Fmake_bool_vector): If !INIT, rely on make_clear_bool_vector.
* src/alloc.c (Fbool_vector):
* src/fns.c (Freverse): Don’t access uninitialized bool_vector words.

(cherry picked from commit 79b9f05d3a44b25db9fd3eff9cc002324cfa790c)

Fix setup of fonts for 'han' script.

* lisp/international/fontset.el (script-representative-chars): Add
more CJK representative characters to 'han' script.  (Bug#72188)

(cherry picked from commit cb78b43f39432af3301a39507eac23f5f1e9fbf3)

; Skip commit 96f1db89ee7d3696d27a5bf044ada7942e354fda

Document GNU ELPA copyright in tips.texi

* doc/lispref/tips.texi (Library Headers): Document that GNU ELPA
packages should have their copyright assigned to the FSF.

(cherry picked from commit 55110d1fda2daa204d98f93872577cca81733ad4)

Fix compilation on builds with native rectangle structures

* src/androidgui.h (CONVERT_TO_NATIVE_RECT)
(CONVERT_FROM_EMACS_RECT): Delete redundant macro definitions.

* src/xdisp.c (Fremember_mouse_glyph) [CONVERT_TO_EMACS_RECT]:
Expand CONVERT_TO_EMACS_RECT to convert native rectangles into
a readable format if required.  Reported by Stefan Kangas
<stefankangas@gmail.com>.

(cherry picked from commit 358dbbb723b735eddd3f821ffeaf5382778433bd)

Respect mouse-fine-graned-tracking in touch screen simple translation

* lisp/touch-screen.el (touch-screen-current-tool): Expand doc
string.
(touch-screen-handle-point-update): Record extents of glyph
beneath the mouse as computed by `remember_mouse_glyph' if
necessary, and defer generation of mouse-movement events till
the mouse exit it.

* src/xdisp.c (Fremember_mouse_glyph): New function.
(syms_of_xdisp): Define new subr.

(cherry picked from commit 892abde34e052f7a9b1b27fcb27ded13b4ba3c04)

; Skip commit 079e5a03156f7461d1c8f008663404277cac9ade

Miscellaneous checkdoc fixes

* lisp/ansi-color.el (ansi-color--ensure-context):
* lisp/doc-view.el (doc-view-svg-face):
* lisp/external-completion.el (external-completion-table):
* lisp/ffap.el (ffap-ro-mode-hook, ffap-gnus-hook):
* lisp/find-file.el:
* lisp/flow-ctrl.el (flow-control-c-s-replacement)
(flow-control-c-q-replacement):
* lisp/forms.el (forms-multi-line):
* lisp/help.el (search-forward-help-for-help):
* lisp/hi-lock.el (hi-lock-use-overlays):
* lisp/image.el (find-image):
* lisp/isearch.el (isearch-forward, isearch-forward-regexp)
(isearch-lazy-count-format):
* lisp/jsonrpc.el (jsonrpc--continue, initialize-instance):
* lisp/mouse-copy.el (mouse-kill-preserving-secondary):
* lisp/pixel-scroll.el (pixel-bob-at-top-p)
(pixel-scroll-down-and-set-window-vscroll):
* lisp/printing.el (pr-gv-command, pr-gs-command)
(pr-gs-switches):
* lisp/register.el (register-use-preview):
* lisp/repeat.el (repeat-check-key):
* lisp/saveplace.el (save-place-abbreviate-file-names):
* lisp/select.el (gui--clipboard-selection-unchanged-p):
* lisp/ses.el (ses-header-row):
* lisp/simple.el (transpose-sexps-default-function)
(normal-erase-is-backspace, normal-erase-is-backspace-mode):
* lisp/sqlite-mode.el (sqlite-mode):
* lisp/tempo.el (tempo-insert-region):
* lisp/term.el (term-mode-map, term-mode, term-char-mode):
Checkdoc fixes.

(cherry picked from commit e4760109ac8e3b0d73dd37e11121a01362542364)

Work around GCC bug 58416 on 32-bit x86

* configure.ac (C_SWITCH_MATCHINE): On 32-bit x86 with GCC 4+,
append -mfpmath=sse (if SSE2 is known to work) or -fno-tree-sra
(otherwise) to work around GCC bug 58416.
* etc/NEWS: Mention this.

(cherry picked from commit 9f4fc6608212191e1a9e07bf89f38ba9e4ea786c)

In ‘INSTALL’ put configure vars in one section

* INSTALL: Move description of CFLAGS etc. into the section headed
“Here is a complete list of the variables you may want to set”
since they are also variables one might want to set.

(cherry picked from commit 524e9d50a78c019ab23ecf469787d5ff6c119025)

Don't set exit info in Eshell if the command is being piped elsewhere

Previously, the exit info in Eshell was that of the last command that
finished, rather than the last command in a pipeline.

* lisp/eshell/esh-cmd.el (eshell-exec-lisp)
(eshell-lisp-command): Check whether the command is being piped.

* lisp/eshell/esh-proc.el (eshell-gather-process-output): Record whether
the command is being piped...
(eshell-sentinel): ... and do the right thing with that info.

* test/lisp/eshell/esh-proc-tests.el
(esh-proc-test/sigpipe-exits-process): Check the exit status to ensure
we don't report the first process's SIGPIPE exit.

(cherry picked from commit b7893e73878df83043e05dc8cb811971c0e99f03)

Split out exit code parts of 'eshell-close-handles' into a new function

* lisp/eshell/esh-cmd.el (eshell-last-command-status)
(eshell-last-command-result): Move here from esh-io.el.
(eshell-set-exit-info): New function, extracted from
'eshell-close-handles'.

* lisp/eshell/esh-io.el (eshell-close-handles): Make old calling
convention obsolete.  Update callers to use 'eshell-set-exit-info' as
needed.

(cherry picked from commit 39c704e03de59a1cc46494fb71426e7a7fe8013d)

* lisp/progmodes/peg.el (peg-syntax-classes): Typo (bug#72131)

(cherry picked from commit a478423d19fe320972fc319dd2cf7fdbca914754)

* lisp/which-key.el: Bump version to 3.6.1

This is necessary to trigger a new ELPA release.

(cherry picked from commit 34b832fce1d01c22aa644196cd6e6b50b1d403ee)

; * test/lisp/net/dbus-tests.el: silence compilation warnings

(cherry picked from commit f591f477791aafbfe1086398fefdafed213b6ced)

Visualize ranking of last game when adding scores

* lisp/play/gamegrid.el (gamegrid-add-score-insecure): Move point to
the score just added, or end of buffer if the new score did not make
the list.  This makes it easier to see where the last game
ranked.  (Bug#72185)

(cherry picked from commit c330b97fe24088c32394fae7f52aa18315d123b0)

* lisp/transient.el (static-if): Remove duplicated definition.

(Bug#72182)

This should have been removed when the standalone version was merged
into Emacs.

(cherry picked from commit 951fb93956d3b90aa6d1fbc8c3dcd25c42fbe7dc)

Adapt file-remote-p doc

* doc/lispref/files.texi (Magic File Names): Adapt file-remote-p.

* lisp/files.el (file-remote-p): Adapt docstring.

(cherry picked from commit 0218fb214376555df52188be4afee16249e3639c)

; Fix typo in etc/ORG-NEWS (Bug#72186)

(cherry picked from commit 34c1094e607c7ec89d66702da7f298b454b7c192)

Allow specifying stdout/stderr separately in some Eshell commands

* lisp/eshell/eshell.el (eshell-command): Add ERROR-TARGET.
* lisp/eshell/em-script.el (eshell-execute-file): Make interactive, and
add ERROR-TARGET.

* doc/misc/eshell.texi (One-Off Commands, Scripts): Update
documentation.

* etc/NEWS: Announce this change.

(cherry picked from commit 99b360bb5aabf324cf038c27ac76ac1513319754)

; * doc/misc/eshell.texi (Bugs and ideas): Remove now-implemented idea.

(cherry picked from commit 965be7bc461b3f56d68f07f3f13fe4e3f2d7e259)

Improve implementation of built-in Eshell "kill" command

* lisp/eshell/esh-proc.el (eshell/kill): Fix handling of commands like
"kill 123".  Use REMOTE when signalling PIDs in remote directories.
Signal using process objects when possible.  Report errors when failing
to signal.

* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill/process-id)
(esh-proc-test/kill/process-object): New tests (bug#72013).

(cherry picked from commit 259f4613bdea27abf330b58a9683ca4a9e936777)

Handle broken pipes in a better way in Eshell

* lisp/eshell/esh-proc.el (eshell-insertion-filter): Send SIGPIPE
delaying for Tramp and falling back to SIGTERM for MS-Windows
(bug#72117).

(cherry picked from commit c7a498260ce3c016611da6e5e0aa5edeca58cd80)

Improve handling of deferrable Eshell commands

Now, we use the 'eshell-deferrable' wrapper to wrap a form that returns
a process (or list thereof).  This improves upon the old method, which
failed to handle 'eshell-replace-command' correctly.  In that case,
Eshell would fail to unmark commands as deferrable when necessary
(e.g. for commands in pipelines).

* lisp/eshell/esh-cmd.el (eshell-deferrable-commands): Make into a
defvar.
(eshell-deferrable): New function...
(eshell-structure-basic-command): ... use it.
(eshell-trap-errors): Rename to...
(eshell-do-command): ... this, and use 'eshell-deferrable'.  Update
callers.
(eshell--unmark-deferrable): Remove.  Update callers.
(eshell-execute-pipeline): Remove 'eshell-process-identity'.
(eshell-process-identity, eshell-named-command*, eshell-lisp-command*):
Make obsolete.

* test/lisp/eshell/esh-cmd-tests.el (eshell-test-replace-command): New
function.
(esh-cmd-test/pipeline/replace-command): New test.

(cherry picked from commit 1550213613b397da6e879cc0d00ede916f6c62cc)

Fix minor code style issue in pgtkfns.c

* src/pgtkfns.c (pgtk_get_defaults_value)
(pgtk_set_defaults_value): Fix code style.

(cherry picked from commit 76874df05f7758deb4f47b7df278e54a66456fc9)

Avoid overflow in pgtk_is_numeric_char

* src/pgtkfns.c (PATH_MAX_LEN): New macro.
(parse_resource_key): Avoid overflow if a key is RESOURCE_KEY_MAX_LEN
long by making the array larger.

(cherry picked from commit 87facc9e3da3ca70a5a75eec57e3fa22c0636c92)

Use strnlen to avoid unnecessary work in pgtkfns.c

* src/pgtkfns.c (pgtk_get_defaults_value, pgtk_set_defaults_value):
Factor out new function...
(pgtk_check_resource_key_length): ...to here.  Avoid unnecessary work by
using strnlen.

(cherry picked from commit d00a10333f06d30fee93ba3ee033e74dc4ff85bc)

Minor cleanup of code in insdel.c

* src/insdel.c (del_range_2): Update *_BYTE variables _after_
updating the corresponding character values.  This follows what we
do everywhere else, and allows to put a watchpoint on, say, Z_BYTE
to check consistency between the character and byte counts.  See
bug#72165 for one situation where it is useful.

(cherry picked from commit a90a1ed527e89cf26737b6a123070c55c3118923)

* etc/TODO: Delete item about merging Magit.

Change requested by Jonas Bernoulli <jonas@bernoul.li>.

(cherry picked from commit 5916b172bdcdeb96b058c2ae18455f66dd6326fb)

; Fix typos

(cherry picked from commit a6cab228d4d1a82a80eac81b057857a230eef0b5)

* doc/man/emacs.1.in: Add "No warranty" notice.

(cherry picked from commit 41dc28244f238739ce5c8f0c25a3d6d66992dd54)

; * doc/man/emacs.1.in: Improve wording.

(cherry picked from commit b2ac343586709063edb2a3bdfb2cdc1ac484cda1)