; Add some tree-sitter thing content to the manual

* doc/lispref/parsing.texi (User-defined Things): List "builtin"
things.

(cherry picked from commit 10f976300d03a8cb9a12a5d2548d1b275ac3edcc)

Invert preprocessor condition to fix 'C-x 4 a'

Typing 'C-x 4 a' in the main function now correctly adds 'main' to the
generated ChangeLog, whereas before it added 'andreid_emacs_init'.
Inverting the preprocessor condition seems like an easier fix than
changing the add-change-log-entry-other-window heuristic.

* src/emacs.c (main): Invert preprocessor condition to appease the
'add-change-log-entry-other-window' heuristic.

(cherry picked from commit eaf5bf736e1dd5eb977a16a3f1b3dfd3da3c4612)

Prefer defvar-keymap in info.el

* lisp/info.el (Info-mode-line-node-keymap, Info-link-keymap):
Convert to defvar-keymap.

(cherry picked from commit 29058579e9f27872d47e9d5146dfd9ce79697a0d)

Move pure+side-effect-free declarations to byte-opt.el

* src/json.c (syms_of_json): Move pure and side-effect-free declarations
for json-serialize and json-parse-string from here...
* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns, pure-fns):
...to here.

(cherry picked from commit bef0d80be88906b66dec06970d7782f0f7b219c0)

; Skip commit 465544eb556777f16415c10e7607f7b72ec5a2b5

* lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844)

(cherry picked from commit 55303a6bc0a06d32ec757b6291d40e8f28565946)

trusted-content: Adjust the last patch based on preliminary feedback

* lisp/files.el (trusted-content): Rename from `trusted-files`.
Update all references.

* lisp/progmodes/elisp-mode.el (lisp-interaction-mode):
* lisp/ielm.el (inferior-emacs-lisp-mode):
* lisp/simple.el (read--expression): Set `trusted-content` since
these buffers contain code that the user presumably intends to run anyway.
(elisp--safe-macroexpand-all): Make the warning more discreet.

(cherry picked from commit 8b6c6cffd1f772301e89353de5e057835af18a30)

image-dired: Don't croak on file names with regexp characters

* lisp/image/image-dired-dired.el (image-dired-mark-tagged-files):
* lisp/image/image-dired-tags.el (image-dired-get-comment)
(image-dired-write-comments, image-dired-list-tags)
(image-dired-remove-tag, image-dired-write-tags): Quote file name
for search-forward-regexp.  (Bug#73445)

Copyright-paperwork-exempt: yes
(cherry picked from commit 7930fe2f44f50b6a7abf5fbe1218dcc15e85b28d)

; * lisp/widget.el: Delete commented out code.

(cherry picked from commit 32060cef1cb58e53896f4fea82d2d30d35501d93)

; Skip commit 69b16e5c63840479270d32f58daea923fe725b90

; * doc/lispref/frames.texi (Multiple Terminals): Add indexing.

(cherry picked from commit 5c6dbc65f3642b98d3e1ff3a901c1580353783df)

Update documentation of 'etags' regexps some more

* doc/emacs/maintaining.texi (Etags Regexps):
* doc/man/etags.1: Give more details about what's not supported.

(cherry picked from commit 856a58e28279139cfd6503917954fd75fcdd7e78)

Update documentation of 'etags' regexps

* doc/emacs/maintaining.texi (Etags Regexps):
* doc/man/etags.1: Say that shy groups are not supported (bug#74861).

(cherry picked from commit 4c68846223b91e50e4a15fbc59d2238605ce2a57)

elisp-mode.el: Disable Flymake byte-compile backend in untrusted files

To address serious security issues (CVE-2024-53920), disable
`elisp-flymake-byte-compile` except in those files explicitly
specified as "trusted".

For that introduce a new custom var `trusted-files` and new
function `trusted-content-p`.

While at it, similarly skip the implicit macroexpansion done during
completion if the current file is not trusted.

* lisp/files.el (trusted-files): New variable.
(trusted-content-p): New function.

* lisp/progmodes/elisp-mode.el (elisp--safe-macroexpand-all):
New function, extracted from `elisp--local-variables`.
Use `trusted-content-p`.
(elisp--local-variables): Use it.
(elisp-flymake-byte-compile): Disable according to `trusted-content-p`.

(cherry picked from commit b5158bd191422e46273c4d9412f2bf097e2da2e0)

Signal errors for unimplemented features

* src/frame.c (make_terminal_frame): Error for minibuffer-only frames.
* src/term.c (Ftty_frame_restack): Signal error.

(cherry picked from commit 6fa2050ee7663441e4d0aa4fff974cc5d45bffc7)

* lisp/tty-tip.el (tty-tip--create-frame): Use tooltip-hide-delay

(cherry picked from commit b67feec95e8f7526fecab0bb10f91233ba06fef8)

Prevent too early hiding of tty tips

* lisp/tty-tip.el (tty-tip--show-timer): Renamed from
tty-tip--timeout-id.
(tty-tip--hide-timer): New variable.
(tty-tip--delete-frame): Cancel hide timer if set.
(tty-tip--create-frame): Use run-with-timer instead of run-at-time
for consistency.

(cherry picked from commit d22882e418eb100423c53d90cca257bb0c197b86)

Consider all windows for redisplay if frames have been cleared

* src/xdisp.c (clear_garbaged_frames): Return true if any tty frame's
current matrix has been cleared.
(redisplay_internal): Consider all windows if clear_garbaged_frames
returns true.

(cherry picked from commit 196c761c66d47ff6a93d9134ca73d1c08a9125db)

* src/xdisp.c (redisplay_internal): Use assq_no_quit.

(cherry picked from commit 7608563d3b274d805111827a39cc73aaa147eaa1)

Revert "Don't pause display for pending input"

This reverts commit f62d70f52f4f6b7ed158d618bf790df21f171172.

(cherry picked from commit e7359fbbc40bbf714fb5b4bffc256b455fbe9a6c)

Revert "Remove an unused parameter"

This reverts commit 627cbf05b53756883a789ff45727acf23f5066a4.

(cherry picked from commit e5a2bc740dc43de63acb6e9603ad1905fac1e2c6)

Remove an unused parameter

* src/dispnew.c (combine_updates): Remove unused parameter inhibit_scrolling.
* src/xdisp.c (redisplay_internal): Adjust caller.
* src/dispextern.h: Change function prototype.

(cherry picked from commit 627cbf05b53756883a789ff45727acf23f5066a4)

Don't pause display for pending input

* src/dispnew.c: Remove display_completed, redisplay_dont_pause,
redisplay-dont-pause was declared obsolete in Emacs 24.  Remove anything
checking pending input, change function signatures accordingly, and so
on.

* src/keyboard.c (read_char): Don't use redisplay_dont_pause.
* src/minibuf.c (read_minibuf): Use new function signatures.
* src/xdisp.c: Don't check display_completed. Use new API.

* lisp/subr.el (redisplay-dont-pause): Remove declaration.

(cherry picked from commit f62d70f52f4f6b7ed158d618bf790df21f171172)

Respect redisplay_dont_pause in combined update

* src/dispnew.c (combine_updates): Respect redisplay_dont_pause. This is
important for echo_area_display which binds that variable.

(cherry picked from commit 4da9abe653fe536afc67fe5e175227eac10e31cc)

Fix a FIXME In redisplay_internal

* src/xdisp.c (redisplay_internal): Compare root frames before
setting the frame garbaged.

(cherry picked from commit 37cdf2897ad51f45a228c86f5f12feeb284673df)

Change interface of prepare_desired_root_row

* src/dispnew.c (prepare_desired_root_row): Return NULL if we can't
prepare the row.
(produce_box_line, copy_child_glyphs): Callers changed accordingly.

(cherry picked from commit 437ccbe612b377fd5ac492572702978ec75ea0df)

Another case of copying from non-enabled glyphs (bug#74274)

* src/dispnew.c (build_frame_matrix_from_leaf_window): If current window
row is not enabled, don't copy from it.

(cherry picked from commit 582ebedd33ed957b9ad409e35ed7ba9dafa42c01)

; * src/dispnew.c (prepare_desired_root_row): Add commentary (bug#74274).

(cherry picked from commit aa8bebf9b3eff9e53eeb1dc1a91fcc9ee5ee1095)

Don't copy from non-enabled current glyphs (bug#74274)

* src/dispnew.c (prepare_desired_root_row): Check if current row is
enabled.

(cherry picked from commit 8fa26765c0dcedcadf884195189e337cb9778cb8)

Fix hiding tips from pre-command-hook

* lisp/tty-tip.el (tty-tip-mode): Put #'tty-tip--hide on the
pre-command-hook.

(cherry picked from commit 6cd7ce7cf2a36a790c7e1e0a5496c35fc9d56495)

Revert "Mark atimer allocation as ambiguous root"

This reverts commit c42b90b21a4efb3c5a8ebc6e3bd6be2908d1f2ac.

(cherry picked from commit cc3c05cad9ef42cd7b0231efdbdba228aa06de92)

Mark atimer allocation as ambiguous root

* src/atimer.c (start_atimer): Time could be passed a lisp object for
data, we should allocate this as an ambiguous root

(cherry picked from commit c42b90b21a4efb3c5a8ebc6e3bd6be2908d1f2ac)

Remove tip in pre-command-hook

* lisp/tty-tip.el (tty-tip-mode): install pre-command-hook that deleted
the tip frame.

(cherry picked from commit 907c735402dd26e721ca8534df1e326fc53a3012)

Let tty tips disappear automatically

* lisp/tty-tip.el (tty-tip--create-frame): Delete tip frame after
x-show-tooltip-timeout seconds.

(cherry picked from commit e0bfd3ce23eafb13ab0400f3046074b83784d9f8)

Add tty-tip.el, not tooltips, but very close

(cherry picked from commit d27fc61755d8dd4a65db6291f1c83492003b30b1)

* src/dispnew.c (neutralize_wide_char): Don't use used[0]

(cherry picked from commit 908a18c463bf7d2da3c39ea6141cab68fd7eac30)

TTY menus: handle saved state referencing dead frames

* src/term.c (restore_desired_matrix): If a tty menu saves a current
matrix that contains glyphs from a child frame, handle the case that
that child frame dies before the saved state is restored.

(cherry picked from commit 56efab930b5c129aa9c87f99f657b7d704c6d5f9)

Don't copy non-enabled rows from child

* src/dispnew.c (copy_child_glyphs): Check if child row is enabled.

(cherry picked from commit 56708ea676e0fdfaeec36607333bb2955ec3b40e)

* src/frame.c (make_terminal_frame): Check parent is live.

(cherry picked from commit 33f1ab5034c7a5a9333ab6ead01f14a0f91c5f97)

Fix mouse-position for xterm-mouse-mode

* lisp/xt-mouse.el (xterm-mouse-position-function): Return the frame
recorded in the terminal parameter xterm-mouse-frame.

(cherry picked from commit e2323775246c6f09b2d7fb82f8888ebe8f317b0e)

; Skip commit dfb7f1942659cab4464e01f7e498efc4b269de3e

Remove unneeded workaround from w32console.c

* src/w32console.c (w32con_write_glyphs): Remove unneeded test.
(w32con_clear_end_of_line): Fill in the glyph.frame member.

(cherry picked from commit 7aa00fa90d6eb9347034106da10cdbbdc23b3d3a)

Don't work around a corner case once observed

* src/term.c (tty_write_glyphs): Refactor a bit. Don't check for null
glyph frame.

(cherry picked from commit d3f8ed730fa10d7283c6638dc4cc20cabbe4f4bf)

Temporary fix for mouse events on child frames

* src/w32inevt.c (do_mouse_event): Ignore mouse events when the
selected frame is a child frame.

(cherry picked from commit d7bf2cfd5d5713c9a9014807567e3f7e723280cf)

* src/w32console.c (w32con_update_end): Fix cursor display.

(cherry picked from commit a3e41874c1b3d75d18dab9e20e0f183a3086fea4)

Fix dimensions of child frames on w32 console

* src/w32inevt.c (maybe_generate_resize_event): Don't generate
resize events for child frames.

(cherry picked from commit 0d6a014750c63a9a9d6e5bcc195e80bf58dfa276)

More fixes for w32 console build

* src/w32term.c (w32_read_socket): Don't use FRAME_OBSCURED_P,
which was removed.
* src/frame.h (struct frame): Move !HAVE_NTGUI to its original
place.
* src/treesit.c (treesit_load_language): Shut up GCC warning.

(cherry picked from commit 4cb7f3935e2b600d23ae78bde2ce54a8a320e08b)

Adapt w32 console to tty-child-frame changes

* src/w32console.c (w32con_write_glyphs): Use the glyph's frame,
not the root frame, to resolve faces from face IDs.

(cherry picked from commit 33586db3d34bcbe6441d98542df2b3370a1e2622)

Handle obscured cursor differently

This also fixes an error made when porting this to savannah.

* src/dispnew.c (abs_cursor_pos, (is_cursor_obscured)
(terminal_cursor_magic): Port correctly and fix.

(cherry picked from commit 9b8d1e0addeca9b508324537e7743d0af508a630)

Deal with wide characters

* src/dispnew.c (make_glyph_space): New function.
(neutralize_wide_char): New function.
(produce_box_sides, copy_child_glyphs): Call neutralize_wide_char.

(cherry picked from commit d1fd1d8fba8a6cfe774f6982bb6ad6c874d0c960)

Fix copy/paste error

* src/dispnew.c (produce_box_glyphs): DonÄt set multibyte_p twice, set
padding_p.

(cherry picked from commit 40aa1e329b637e42fc945cba6213b4e7b4a5d60f)

Fix UB in line_hash_code

* src/dispnew.c (line_hash_code): Avoid undefined behavior on
integer overflow.

(cherry picked from commit dac51f1f66ef93cec6d9ea17e74a193de9ae1ff3)

Some cleanup of frame_parm_table

* src/frame.c (frame_parms): Use built-in symbols for all entries.
(syms_of_frame): Check that entries are valid built-in symbols.

(cherry picked from commit 5cc5fa79bfdf0f905723e592baa41c3f0b12316d)

; Clarify a comment in dispnew.c

(cherry picked from commit 4182dfb7e844bcc7148a3d7f1084cef6982b36d9)

* src/term.c (tty_display_dimension): Avoid warnings.

(cherry picked from commit 560260a631489576e99caedda3233670f2fcd66c)

Fix commenting conventions.

(cherry picked from commit 4ef5ade5da60075418e0f6db1b91ec08a38bb884)

Fix compilation warnings

* src/frame.c (tty_child_size_param):
* src/frame.h (MOUSE_HL_INFO): Avoid NULL dereference warnings.

(cherry picked from commit 9accfc24bcd82087d936cf7ee37470f86cac8ea7)

Don't ignore .patch files

This is VERY bad for magit users like me.

(cherry picked from commit 55af24a1c29724401d66ddd485cf6e4776fe5050)

Comment

(cherry picked from commit fbe63a33f1a0a0df2700245c4cd44cc446ac986e)

Comment

(cherry picked from commit 4a3ba42e6f86fa85b457bdeba9e08ccb4219107d)

Don't set internal_last_event_frame to nil

* src/frame.c (do_switch_frame): Do not set internal_last_event_frame to
nil on ttys.

(cherry picked from commit 0012e555d963b1df2d2c8be9f515ddf09417e110)

Minor refactoring

(cherry picked from commit 6aa203bb04fa75e7562064e9261d7760c1b6562a)

Accept frame param width/height of 0

* src/frame.c (tty_child_size_param): Accept values of 0.

(cherry picked from commit 23409041b135d7b89dcb010a7f22ce9c817d8c76)

Don't check for child frame support

* lisp/paren.el (show-paren-function): Don't check with
display-graphics-p or featurep.

(cherry picked from commit e0ca1256a5747470f3867b231524cc93b87ca2f2)

Set top terminal frame also to children

* src/frame.c (make_terminal_frame): Don't check for being root when
setting top_frame.

(cherry picked from commit 55b72ad87554e3de518366754da64dad239a04bf)

Check for tty-child-frames feature in show-paren

* lisp/paren.el (show-paren-function): Don't rely on display-graphic-p,
also check tty-child-frames feature.

(cherry picked from commit 5445062fabc765b316ecedc26bbb395c75d44405)

Initial child frames based on master

This is based on a diff from 2024-10-15 which still applied.
Since then, I've inadvertantly modified the igc branch so that
it is no longer possible to get a clean diff of what has changed
since I created the branch.

(cherry picked from commit 414de92a562e8912ffdc8ed2995e7ea10d05f13b)

(enable-local-eval): set to nil by default

Fix hangs caused by unbalanced braces in Python f-strings

* lisp/progmodes/python.el (python--font-lock-f-strings):
Temporarily bind forward-sexp-function to nil when calling
'up-list'.  (Bug#74738)

(cherry picked from commit 3c247f86b7639995c8ce2627049bcc91452d2cca)

; * test/lisp/time-stamp-tests.el: make checkdoc happier

(cherry picked from commit 7dcc05987160cabc0c063bc285d34cdb2c3c600f)

time-stamp: fix search end, more compatibility suggestions

* lisp/time-stamp.el (time-stamp): Use a marker for the
search end limit so we don't insert past it.
(time-stamp-conv-warn): Include a second suggested conversion
that might be what was intended.
Include a link to variable 'time-stamp-format'.
* test/lisp/time-stamp-tests.el: more tests

(cherry picked from commit 33532c58992fc44afa5369678cb53252ec7dc3ac)

Check for presuppositions in `calendar-date-is-valid-p'

Do not signal an error in `calendar-date-is-valid-p' if passed a
value which is not a three-element list of integers.  Signaling
an error makes the function unusable as a predicate for valid
date values. (Bug#74848)
* lisp/calendar/calendar.el (calendar-date-is-valid-p): Add the
check that input is a 3-element list.
* test/lisp/calendar/calendar-tests.el: New file with tests.

(cherry picked from commit 77f73abd92f1a627ddec0648dcfe14e56b525f4d)

; Skip commit fd021c07606264a73cd4c1f6fa6fe80a756defe0

; Skip commit 64981660c912e5ab79c1143d9879d9ee7a0b93bf

Add `browse-url-qutebrowser'

The browser launcher supports the NEW-WINDOW argument and
`browse-url-qutebrowser-new-window-is-tab' to open tabs.
Furthermore opening new URLs is sped up via Unix socket IPC if
available.
* lisp/net/browse-url.el (browse-url-qutebrowser-send): Function
to send command to Qutebrowser via IPC.
(browse-url-qutebrowser): New browser launcher.  Use
`browse-url-qutebrowser-send'.
(browse-url-qutebrowser-program, browse-url-qutebrowser-arguments)
(browse-url-qutebrowser-new-window-is-tab): New customizables.
(browse-url-mozilla-new-window-is-tab)
(browse-url-firefox-new-window-is-tab)
(browse-url-epiphany-new-window-is-tab): Improve docstrings.

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

(cherry picked from commit ed1f3b8488e18143d658e4f1aca8d21a3b84e2b2)

; * etc/PROBLEMS: Document problem with menu-bar background (bug#74028).

(cherry picked from commit 6942599dbb24c1a469e3d3708df83692b49e4af8)

Fix xt-mouse-tests.el in interactive mode

* test/lisp/xt-mouse-tests.el (with-xterm-mouse-mode): Run only
when noninteractive.

(cherry picked from commit 83245d2269be357db2fff8baa17adb4b05f97aed)

Fix for xt-mouse-tests.el broken in prior commit

xt-mouse-tests not turning on xterm-mouse-mode if it was already
on did not work with xterm-mouse-mode being set to t by default.
It turns out that xt-mouse-tests already does not report proper
results when called inside a running Emacs session so the code
path is not useful anyways.

* test/lisp/xt-mouse-tests.el (with-xterm-mouse-mode): Always
turn on xterm-mouse-mode, even if it is already on.

(cherry picked from commit 2719dccbe5797dd8fcf1ce013df2ff71161b6f55)

Improve menu separator display on ttys slightly (bug#74854)

* src/xdisp.c (display_tty_menu_separator): New function displaying
separators with '-', '=', or ' '.
(display_tty_menu_item): Use it.

(cherry picked from commit b6807a7ddce41e99d320be5f23972f218af004a8)

Fix font-lock of Python f-strings

* lisp/progmodes/python.el (python--font-lock-f-strings): Bind
'parse-sexp-ignore-comments' to nil so that we can look for
closing braces even if a hash is used in the format specifier.
* test/lisp/progmodes/python-tests.el
(python-font-lock-f-string-1): New test.  (Bug#74738)

(cherry picked from commit 71cd290c20dbbd8b14f09818b3c1b58623aea350)

; Skip commit dde5d0a41e2a700f2eb17e93a5e5586195c5780d

* lisp/org/ox-texinfo.el (org-texinfo-template): Fix direntry format

Apparently I was confused and `* FILE.  DESCRIPTION` is not
a valid format, so always use the longer form.

(cherry picked from commit 5923d8ebef93075e053cf50e17b86d34731fe777)

* nt/inc/netinet/tcp.h: New (empty) file.

(cherry picked from commit 69a61f721dda73fb11f2be0ad5c9eaacc82216ab)

* lisp/time-stamp.el: Limit field width to two digits.

(cherry picked from commit 488801baf7de64cc3ad8747c7a0c9f5869afb4e2)

Add support for TCP_NODELAY on network streams

* src/process.c (socket_options): add entry for TCP_NODELAY.
* lisp/emacs-lisp/bytecomp.el: add :nodelay to valid keywords
  for make-network-process compiler-macro.
* doc/lispref/processes.texi: document :nodelay keyword argument
  to set-network-process-option and make-network-process.

(Bug#74793)

(cherry picked from commit c265febd97e940e6580ae42aa648358a0a2ed830)

; * lisp/progmodes/executable.el: Remove stale comment (bug#74846).

(cherry picked from commit 34bedcd58d74f733631ec78afc7bda9a068c714f)

Apply string syntax only to string in jsx (bug#73978)

The current code applies string syntax to too many things.  This
patch makes tsx-ts-mode (and friends) only apply string syntax
to actual text in tsx/jsx.

* lisp/progmodes/typescript-ts-mode.el:
(tsx-ts--s-p-query): Only capture jsx_text.
(tsx-ts--syntax-propertize-captures): handle the case when the
text is one character long.

(cherry picked from commit 989cdb2c35889476702e4d2bd82d8195fa2e7ec0)

Declare tree-sitter functions with a new macro

* lisp/progmodes/c-ts-mode.el:
* lisp/progmodes/cmake-ts-mode.el:
* lisp/progmodes/csharp-mode.el:
* lisp/progmodes/dockerfile-ts-mode.el:
* lisp/progmodes/elixir-ts-mode.el:
* lisp/progmodes/go-ts-mode.el:
* lisp/progmodes/heex-ts-mode.el:
* lisp/progmodes/java-ts-mode.el:
* lisp/progmodes/json-ts-mode.el:
* lisp/progmodes/lua-ts-mode.el:
* lisp/progmodes/php-ts-mode.el:
* lisp/progmodes/ruby-ts-mode.el:
* lisp/progmodes/rust-ts-mode.el:
* lisp/progmodes/js.el:
* lisp/progmodes/python.el:
* lisp/progmodes/sh-script.el:
* lisp/progmodes/c-ts-common.el:
* lisp/progmodes/prog-mode.el:
* lisp/progmodes/typescript-ts-mode.el: Use new macro.
* lisp/treesit.el (treesit-declare-unavailable-functions): New
macro.

(cherry picked from commit 9377ef5c2369202e372774c873af4d6c259cd28f)

Prefer defvar-keymap in perl-mode.el

* lisp/progmodes/perl-mode.el (perl-mode-map): Convert to
defvar-keymap.

(cherry picked from commit 4bdadbdc215aacdc474b33426bf8eb1a1bd54e1f)

Prefer defvar-keymap in f90.el

* lisp/progmodes/f90.el (f90-mode-map): Convert to defvar-keymap.
(f90-menu): Move definition to top level.

(cherry picked from commit a9fcf55d5bb25bd2535d2595652ef15bd3816cea)

Prefer defvar-keymap in dired.el

* lisp/dired.el (dired-mouse-drag-files-map)
(dired-click-to-select-map): Convert to defvar-keymap.

(cherry picked from commit 65aa5608f2c02bb90742d4d176c61182915f7755)

Don't use obsolete mode delhpi-mode

* lisp/files.el (auto-mode-alist): Prefer opascal-mode to obsolete
delphi-mode.

(cherry picked from commit 020128e9dc31fb3b06c39614b7eb20ddb5b3725a)

Don't use obsolete filter-buffer-substring-functions in Org

This patch was also installed in Org mode, here:
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=b9637ef142

* lisp/org/org-agenda.el (org-agenda-mode):
* lisp/org/org-indent.el (org-indent-mode): Don't use obsolete
filter-buffer-substring-functions.

(cherry picked from commit d1bde7b5cb727d6b0559d99669719d5eb832c186)

; * etc/TODO: Add an item for improving defgroups.

(cherry picked from commit 327d3e56f6ecd9e5c49405c87ebb8b78b96d8293)

; * lisp/net/rcirc.el (rcirc-next-active-buffer): Doc fix (bug#74773).

(cherry picked from commit 7ae9ccae0caa58dcf67869e8daa1b1301dce2119)

; Fix :version tag in browse-url

* lisp/net/browse-url.el (browse-url-button-regexp): Fix :version tag.

(cherry picked from commit 3e51be94ae6312b05d4f2a811faeee7328b152cb)

Revert "Attempt to install package first when upgrading"

This reverts commit 3d8e49c41a66a7f05cb96f84e2a10f0f308ac9ca.

(cherry picked from commit dffd4a50c64db5141997ad91e04d9e2107d968b5)

Fix 'gnus-select-method' custom type

* lisp/gnus/gnus.el (gnus-redefine-select-method-widget): Cater
for the 'gnus-search-engine' configuration variable, which takes
2 args instead of 1.   (Bug#74759)

(cherry picked from commit fbcb357b9db1e7d4dd32c1f2b7b01950e66b9b34)

Fix typo in maps.texi

* doc/lispref/maps.texi (Standard Keymaps): Fix typo.  (Bug#74761)

Copyright-paperwork-exempt: yes
(cherry picked from commit 6fd5e02cb9bc888cf454f8e5e8daf3203ae7a13f)

; * etc/DEBUG: Mention "handle SIGINT" on MS-Windows.

(cherry picked from commit 872a7336dc083c6f28acb292cf389f0f14b0f354)