* lisp/net/kubed.el (kubed-create-cronjob): Fix typos

(kubed-define-resource): New keyword argument :plural

kubed.el: Refine 'kubed-create-cronjob'

New commands 'kubed{-transient}-apply'

kubed.el: Fix typo

; Skip commit 156a3ba4f9ef9f7a401cfd3ca118152169f0ddcf

* test/lisp/net/tramp-tests.el (tramp-test42-utf8): Don't test "Tifinagh".

(cherry picked from commit b9f2ef2a333fa7c813913dbba798c5ba8778eefd)

Improve Tramp startup time

* lisp/net/tramp-cmds.el (tramp-repository-branch)
(tramp-repository-version):
* lisp/net/tramp-message.el (tramp-repository-branch)
(tramp-repository-version): Declare.

* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Remove ;;;###tramp-autoload cookie.

(cherry picked from commit 29d4ba56258be582e3f98f1ac1e2a8bb3fc6ae1e)

Use buffer-local value of 'comint-input-ring-size'

When 'comint-read-input-ring' was reading history to the ring,
the global value of 'comint-input-ring-size' was used regardless
of the local value, due to the use of a temporary buffer.
This change fixes the problem.
* lisp/comint.el (comint-read-input-ring): Use buffer-local
value of the ring size.  (Bug#72138)

(cherry picked from commit c1436ac64dc3b30af1ee3994ca346b9bb6984228)

Update to Org 9.7.9

(cherry picked from commit 88e1ec22f271b127d961896b7dddcd58df289c42)

* lisp/net/nsm.el (nsm-verify-connection): Improve docstring.

(cherry picked from commit 9e9121ed6356e02173b57ea612feb7f55c07f2c8)

; Fix punctuation in etc/*

(cherry picked from commit 33c6b4df40e4408b63a2d908a26a91dba80b6a04)

Fix edge-case with 'which-key-dont-use-unicode' setter

* lisp/which-key.el (which-key-dont-use-unicode): Check if the
user options have a 'standard-value' before proceeding to
reevaluate.  This avoids accidentally setting the symbol value
to nil, before the user option has been declared, overriding the
actual non-nil, default values.  (Bug#72077)

(cherry picked from commit 1ae2f004473c1cc26ab654481716c9efb4ecd8de)

Tramp: Handle hops with "%" in their names

* lisp/net/tramp.el (tramp-dissect-file-name, tramp-compute-multi-hops):
Handle hops with "%" in their names, like USER%DOMAIN or POD%NAMESPACE.

(cherry picked from commit d7665595f7bfca86b65e75fa624b0fc7a63fbb41)

NS: prevent makeKeyWindow warnings (bug#69525)

* src/nsterm.m (ns_raise_frame): Don't makeKeyWindow if frame has
no_accept_focus set.

(cherry picked from commit 68a5f1f7d185250e61538f3af764b6e4ea62433f)

; * .gitignore: Add lisp/eshell/esh-groups.el.

(cherry picked from commit 59a895ec4991beff9862029a712b22b47c5b70b3)

Add support for Tifinagh script

* lisp/leim/quail/tifinagh.el: New file.  Contributed by Adam Oudad
<adam.oudad@gmail.com>.
* lisp/language/misc-lang.el ("Tifinagh"): New language environment.

* etc/HELLO: Add a greeting in Tifinagh.
* etc/NEWS: Announce the addition of Tifinagh.

(cherry picked from commit 4e250154ec4dc73eb9a2ec2c00d7a6e9a98b5476)

; * doc/emacs/cmdargs.texi (Initial Options): Fix last change.

(cherry picked from commit 5c08cd4e7c38248ae455e3a55aa1d3f49a3d2894)

Add PROBLEMS entry for bug#72303

* etc/PROBLEMS (Runtime problems specific to PGTK build):
Document that text mode sessions cannot be started without
`-nw'.  (bug#72303)

(cherry picked from commit 309d0a718644385eb73f40c5eaa967e9b1548353)

; Improve documentation of 'line-prefix' and 'wrap-prefix'.

* doc/lispref/text.texi (Special Properties): Spell out more
accurately how 'line-prefix' and 'wrap-prefix' properties should
be set.

(cherry picked from commit 87389f9ff9069f8e3b11ea0ff2e55619763c2231)

; Don't use non-ASCII in ELisp manual sources unless necessary

* doc/lispref/strings.texi:
* doc/lispref/parsing.texi:
* doc/lispref/nonascii.texi:
* doc/lispref/keymaps.texi:
* doc/lispref/intro.texi:
* doc/lispref/help.texi:
* doc/lispref/functions.texi:
* doc/lispref/display.texi:
* doc/lispref/control.texi: ASCIIfy.

(cherry picked from commit 52cae67e1e73615fff184abcc8e635d80f8846ad)

; Don't use non-ASCII in Emacs manual sources unless necessary

* doc/emacs/mini.texi:
* doc/emacs/emacs.texi:
* doc/emacs/custom.texi:
* doc/emacs/calendar.texi:
* doc/emacs/cal-xtra.texi:
* doc/emacs/ack.texi: ASCIIfy.

(cherry picked from commit 4a743729d71d2dd55c7e489f3cead0d78a0dfe31)

Improve documentation of '--init-directory' command-line option.

* doc/emacs/custom.texi (Find Init):
* doc/emacs/cmdargs.texi (Initial Options): More accurate and
detailed description of what '--init-directory' does and how it
affects the Emacs session.  Add index entries and cross-references
as needed.  (Bug#72294)

(cherry picked from commit 268a2d10fc9c6578db23d54f7d790ec591cf211c)

; cperl-mode.el: Fix fontification of flip-flop (Bug#72296)

* lisp/progmodes/cperl-mode.el (cperl-find-pods-heres): Prevent a
movement of point from bleeding into a following clause.
* test/lisp/progmodes/cperl-mode-tests.el (cperl-test-bug-72296):
Add a test for the flip-flop operator with code from the report.

(cherry picked from commit c27055a938aadec81e4603d00e7d0997c4d2579f)

; * admin/MAINTAINERS: Add myself for maintaining some areas.

(cherry picked from commit fcd4e4c895de57ade38e609021769e3e63399a14)

Fix display of 'display' strings in RTL paragraphs at window-start

* src/xdisp.c (handle_single_display_spec)
(get_overlay_strings_1, push_prefix_prop): Initialize bidi
paragraph direction if not yet done.  (Bug#72287)

(cherry picked from commit c22b4198b2e5a9d63109c5ceeb386fbb1904f5dc)

Fix bug in server.el introduced by 0d7d835902df

0d7d835902df renamed 'server--process-filter' into
'server--process-filter-1' but updated the corresponding
'cl-return-from' tag to 'server--process-filter'.

* lisp/server.el (server--process-filter-1): Fix 'cl-return-from' tag.

(cherry picked from commit fdc133e97f6527693571472d058beb0e4fb80343)

; * admin/MAINTAINERS: Remove Nicolas Petton.

Change agreed with Nicolas Petton <nico@petton.fr>.

(cherry picked from commit af527051cd33a90321ab2bac8c0f1f7bcb0af441)

Use timer accessors instead of aref/aset

* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/gnus/mail-source.el (mail-source-start-idle-timer):
* lisp/play/gamegrid.el (gamegrid-set-timer):
* lisp/progmodes/vhdl-mode.el (vhdl-run-when-idle):
* lisp/simple.el (analyze-text-conversion):
* lisp/time.el (display-time-event-handler):
Use timer accessors.

(cherry picked from commit e56e4b345a25194bc7adb83523e8d886b718c9fa)

lisp/minibuffer.el (completion--sifn-requote): Fix bug#72176

(cherry picked from commit 7170282a59a1981cd44f46d69a28f2c47a46884b)

* admin/notes/spelling: Update note.

(cherry picked from commit 68906f184cba8b1fb75401917cccfe219f6826b0)

Don't produce invalid XML with multi-line commenting style

Both XML and HTML forbid double hyphens inside comments.  However,
nxml-mode was using a `!--' as a comment padding if `comment-style'
was set to any of the styles that supposed to add padding.  This infix
was auto-derived due to `comment-continue' being nil.  To fix that set
`comment-continue' explicitly.  It's unclear what padding should be
used, but from looking at other editors it seems they don't typically
add padding in XML, so let's be simple for now and just set
`comment-continue' to empty string.

* lisp/nxml/nxml-mode.el (nxml-mode): Make 'comment-continue' a
buffer-local variable set to the empty string.  (Bug#71772)

(cherry picked from commit 9eea6be5abffa91d21ea299158d5a2cd6cfb5089)

; Skip commit b97786d9f6ec242501e8db40bb4da08f0f64d04d

Standardize possessive apostrophe usage in manuals, docs, and comments

See the note in admin/notes/documentation.
Ref: https://lists.gnu.org/r/emacs-devel/2012-02/msg00649.html

(cherry picked from commit a79966156633ae1e49e3fef17ff7212c8f35a26f)

Don't refer to obsolete finder group "wp"

* lisp/textmodes/rst.el: Don't refer to obsolete finder group "wp".

(cherry picked from commit 67faaead754c0a11bd89fdcde2533bc51b71ef0e)

minibuffer.el: Default to 'regexp' style for 'search' completions

New command 'kubed-explain'

kubed.el: Add optional per-column value-formatting function

New commands 'kubed{-transient}-exec'

; Remove accidentally inserted text from docstring

* lisp/net/kubed.el (cronjob): New resource type

kubed.el: Fix filtering resource definition files by kind

kubed.el: Correctly handle spaces in resource properties

kubed.el: Minor cleanups

New commands 'kubed{-transient}-diff'

New commands 'kubed{-transient}-attach'

(kubed-forward-port-to-pod): Fix prompt

New commands 'kubed-transient', 'kubed-transient-run'

New command 'kubed-run'

Add more default completion styles for 'cobra-command-line'

(kubed-pods-{dired,shell}): Use new Tramp file name syntax

Tramp's method "kubernetes" supports now optional namespace

* doc/misc/tramp.texi (Inline methods): Extend Kubernetes host
name syntax by an optional namespace.
(Kubernetes setup): Mention optional namespace part of the host name.

* etc/NEWS: Tramp's method "kubernetes" supports now optional namespace.
Fix typos.

* lisp/net/tramp-container.el (tramp-kubernetes-namespace):
Initialize with nil.  Adapt docstring.
(tramp-kubernetes--name-regexp): New defconst.
(tramp-kubernetes--host-name-regexp): Change in order to cover
also an optional namespace.  (Bug#59797)
(tramp-kubernetes--namespace): New defun.
(tramp-kubernetes--context-namespace): Use it.
(tramp-skeleton-kubernetes-vector): Add sanity check for
superfluous user name or port number.

(cherry picked from commit d2cb9f2bf6ef9f3fcd8c21455ca1f1e624e61bf4)

Fix cherry-picking of d458664e893cd74f46bf9d00559ff5386c3dbf44

; * doc/emacs/misc.texi (Document View): Improve wording (bug#72241).

(cherry picked from commit ba31c62f815537c0412eb84e8188cc5c3c4948b1)

Fix jumping to page in DocView's text contents (bug#72275)

* lisp/doc-view.el (doc-view-open-text): Set page-delimiter to the form
feed character in the text contents buffer (bug#72275).

(cherry picked from commit c6937ef88b19d46342cefc1493a70f21a8993e08)

Fix process-attributes rss and pmem on GNU/Linux

Problem reported by Rahguzar <https://bugs.gnu.org/72278>.
* src/sysdep.c (system_process_attributes):
[GNU_LINUX || CYGWIN || __ANDROID__]: When computing rss and pmem,
don’t assume pagesize is 4096; it could be greater.

(cherry picked from commit 42cdfe7f60ef7ae3bccb5b1e43349c3a6b54ac4a)

Describe that DocView text contents display is in a separate buffer

* doc/emacs/misc.texi (Document View): Adjust the docs to describe the
new behavior (separate buffer for the text contents) from bug#72241.

(cherry picked from commit 6eb3827f7bf757ef63c3e8e4a9971e18cf36423f)

bug#72241: 31.0.50; [PATCH] Use a dedicated buffer for `doc-view-open-text'

Here is an updated version of this patch.  WDYT?

From 6e32534012cafeda1d7e67aab23a8206bc887c9f Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Sun, 21 Jul 2024 18:52:52 +0200
Subject: [PATCH] Use a dedicated buffer for `doc-view-open-text'

* lisp/doc-view.el (doc-view-open-text): Create a new "text
contents" buffer and switch to it.
(doc-view-toggle-display): Switch back to the document buffer
and kill the "text contents" one.
* etc/NEWS: Mention the change.

(cherry picked from commit 210b98bc9937a86920716ebdf0b0e00a0c79c8fe)

; * etc/NEWS: Fix header level.

(cherry picked from commit 2f5af5cab3869af426631735f12acf30798136bf)

Delete defgroup "wp" obsolete since Emacs 26

* lisp/cus-edit.el (wp): Delete defgroup obsolete since Emacs 26.
(text): Don't inherit obsolete customization group 'wp'.
* lisp/finder.el (finder-known-keywords): Delete 'wp' keyword.

(cherry picked from commit 0ae70433eabe9cf672a7f0f0803f72ad136b1344)

(error): Remove support for old calling convention

* lisp/subr.el (error): Remove support for the Emacs 22 calling
convention '(error &rest args)'.

(cherry picked from commit a6a4ad13e48c656a530bea37d251a2dc55cc47d8)

Add some basic checking for function type declarations

* lisp/emacs-lisp/byte-run.el (byte-run--anonymize-arg-list): New function.
(byte-run--set-function-type): Add some basic checking for
the function type being declared.

(cherry picked from commit baf9f1210a3e44aa19d9ac90e5a4faca214127a7)

kubed.el: Mention 'kubed-transient'

Integrate 'kubed-kubectl-command' with transient menus

Rename 'kubed-kubectl-executable' to '-program'

Move command line completion code from kubed.el to new file cobra.el

(kubed-command-line-completion-table): Elucidate, optimize

kubed.el: Add some commentary

Adapt Tramp tests

* test/lisp/net/tramp-archive-tests.el (ert-resource-directory-format)
(ert-resource-directory-trim-left-regexp)
(ert-resource-directory-trim-right-regexp, ert-resource-directory)
(ert-resource-file): Don't define.
(tramp-archive--test-emacs28-p): Remove.
(top): Remove unneeded skips.  Use original objects instead of
their `tramp-compat-' counterparts when possible.

* test/lisp/net/tramp-tests.el (seq): Don't require.
(lock-file-name-transforms, process-file-return-signal-string)
(remote-file-name-inhibit-locks, dired-copy-dereference): Don't declare.
(ert-resource-directory-format)
(ert-resource-directory-trim-left-regexp)
(ert-resource-directory-trim-right-regexp, ert-resource-directory)
(ert-resource-file): Don't define.
(tramp--test-emacs28-p): Remove.
(top): Remove unneeded skips.  Use original objects instead of
their `tramp-compat-' counterparts when possible.

(cherry picked from commit d458664e893cd74f46bf9d00559ff5386c3dbf44)

Remove Emacs 27 compatibility from Tramp

* doc/misc/tramp.texi (Frequently Asked Questions):
Adapt supported Emacs versions.

* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.8.0-pre".

* lisp/net/tramp-compat.el (tramp-compat-file-modes)
(tramp-compat-set-file-modes, tramp-compat-set-file-times)
(tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes)
(tramp-compat-directory-empty-p, tramp-compat-null-device)
(tramp-compat-string-replace, tramp-compat-string-search)
(tramp-compat-make-lock-file-name)
(tramp-compat-file-name-concat)
(tramp-compat-replace-regexp-in-region, tramp-compat-length<)
(tramp-compat-length>, tramp-compat-length=)
(tramp-compat-always): Remove.

* lisp/net/tramp-adb.el:
* lisp/net/tramp-androidsu.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-message.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sshfs.el:
* lisp/net/tramp-sudoedit.el:
* lisp/net/tramp.el: Use original objects instead of their
`tramp-compat-' counterparts when possible.

(cherry picked from commit c4e8112f983a2add3253e5607f0c29f70e5b4081)

Fix some function type declaration

* lisp/window.el (get-lru-window, get-largest-window): Fix
function type declaration.
* lisp/subr.el (error): Likewise.

(cherry picked from commit 976416bebe278a7cf65ab58b1918c9c27e3a09bd)

* 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