Fix return value of python-nav-end-of-defun

* lisp/progmodes/python.el (python-nav-end-of-defun): Return
non-nil if in a def/class, as the doc string implies (bug#51601).

Rename button-buttonize to buttonize

* lisp/help.el (help--describe-command):
* lisp/emacs-lisp/memory-report.el (memory-report--buffers):
* lisp/button.el (button-buttonize):
* doc/lispref/display.texi (Making Buttons): Rename
button-buttonize to just buttonize and adjust callers.

Revert "* lisp/progmodes/xref.el (xref-pop-marker-stack): Don't obsolete."

This reverts commit f56408a6f0152cd46d1ea8a0985fbfeeb839ea06.

As commented by Dmitry Gutov in [1], obsoleting `xref-pop-marker-stack`
makes sense.

[1] https://lists.gnu.org/archive/html/emacs-devel/2021-10/msg01870.html

Add a Gnus command to emojize symbols

* doc/misc/gnus.texi (Article Display): Document it.

* lisp/gnus/gnus-art.el (gnus-treat-emojize-symbols): New user option.
(gnus-treatment-function-alist): Map.
(article-emojize-symbols): New command and keystroke.

Add new user option mml-attach-file-at-the-end

* lisp/gnus/mml.el (mml-attach-file-at-the-end): New user option.
(mml-attach-file): Use it.

image-dired: Set default-directory in thumbnail buffer

* lisp/image-dired.el (image-dired-show-all-from-dir): Set
default-directory.  This fixes e.g. 'dired-jump'.

Make image-dired-display-image-mode inherit from image-mode

* lisp/image-dired.el (image-dired-display-image-mode):
Inherit from 'image-mode'.  (Bug#10758)
(image-dired-display-image): Don't generate a temporary image, which
is no longer needed with the above change.
(image-dired-display-thumbnail-original-image)
(image-dired-dired-display-image)
(image-dired-mouse-display-image): Simplify.

(image-dired-temp-image-file)
(image-dired-cmd-create-temp-image-program)
(image-dired-cmd-create-temp-image-options)
(image-dired-display-window-width-correction)
(image-dired-display-window-height-correction)
(image-dired-display-window-width)
(image-dired-display-window-height)
(image-dired-display-current-image-full)
(image-dired-display-current-image-sized)
(image-dired-window-height-pixels): Make obsolete.
(image-dired-create-display-image-buffer): Make into obsolete
function alias for 'ignore'.
(image-dired-display-image-mode-map): Simplify by removing things
duplicated from `image-mode-map'.  Disable some commands from
`image-mode-map' that doesn't make sense for Image-Dired.
(image-dired-display-image-mode-menu): Remove menu, as it no longer
contains anything useful.
(image-dired-minor-mode):
* doc/emacs/dired.texi (Image-Dired): Update documentation for the
above change.

; * lisp/image-dired.el: Remove redundant :group args.

Improve theming of image-dired-thumb-mark

* etc/themes/adwaita-theme.el (adwaita):
* etc/themes/deeper-blue-theme.el (deeper-blue):
* etc/themes/dichromacy-theme.el (dichromacy):
* etc/themes/leuven-theme.el (leuven):
* etc/themes/manoj-dark-theme.el (manoj-dark):
* etc/themes/whiteboard-theme.el (whiteboard): Add definitions for
the 'image-dired-thumb-flagged' face.

image-dired: Add face for flagged files

* lisp/image-dired.el (image-dired-thumb-mark): New defface.
(image-dired-thumb-update-marks): Mark flagged file with above new defface.
(image-dired-dired-file-marked-p)
(image-dired-thumb-file-marked-p): Add optional argument to be
used by 'image-dired-*-flagged-p' functions below.
(image-dired-dired-file-flagged-p)
(image-dired-thumb-file-flagged-p): New defuns.
(image-dired-thumb-mark): Improve definition with color classes.
(image-dired-thumb-visible-marks): Doc fix.

Fix declaration syntax of 'image-dired--on-file-in-dired-buffer'.

* lisp/image-dired.el (image-dired--on-file-in-dired-buffer): Fix
declaration syntax.

Fix encoding issues in gitmerge.el, make it work on MS-Windows

* admin/gitmerge.el (gitmerge-emacs-version, gitmerge-show-log)
(gitmerge-show-diff, gitmerge-show-files, gitmerge-missing)
(gitmerge-setup-log-buffer, gitmerge-resolve)
(gitmerge-commit-message, gitmerge-apply)
(gitmerge-resolve-unmerged, gitmerge-repo-clean)
(gitmerge-commit): Bind coding-system-for-read/write to the
appropriate vc-git values.
(gitmerge-apply) [windows-nt]: Pass long merge log messages via a
temporary file.
(gitmerge): Clarify the description of the "R" flag.

Merge from origin/emacs-28

3e4eb54 ; * etc/PROBLEMS: Minor copyedits of the last change.  (Bug#5...
35bc211 Document a macOS error message when opening Emacs
4df9998 Fix header-line and tab-line when mode-line-compact is set
81915a9 Add manual section about how to avoid regexp problems
a16e66c Clarify build environment
6ab6b2f Clarify build directory structure
9d61620 * src/pdumper.c (dump_do_dump_relocation): Add sanity check.

; * etc/PROBLEMS: Minor copyedits of the last change.  (Bug#51571)

Document a macOS error message when opening Emacs

* etc/PROBLEMS: Document a potential error message when opening Emacs
on macOS for the first time.

Fix widgets in Outline mode on TTY frames

* lisp/outline.el (outline--valid-emoji-p): Don't try to probe
support for display of Emoji characters on TTY frames.  (Bug#51578)

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

A better fix for bug#51583

* src/w32.c (w32_get_resource): Move from here...
* src/w32fns.c (w32_get_resource): ...to here.
(w32_applytheme): No longer a no-op for Cygwin w32 builds.
(globals_of_w32fns): Do attempt to load dwmapi.dll and uxtheme.dll
in the Cygwin w32 build.

; cperl-mode.el: Fix one match-count in my commit 2021-09-14

* lisp/progmodes/cperl-mode.el (cperl-init-faces): Matching group needs
to be adjusted according to the regexp change in my previous commit

Fix the Cygwin w32 build broken by adding the dark theme support

* src/w32fns.c (w32_applytheme): Make a no-op for Cygwin w32
builds.
(globals_of_w32fns): Don't attempt to load dwmapi.dll and
uxtheme.dll in the Cygwin w32 build.  (Bug#51583)

Fix header-line and tab-line when mode-line-compact is set

* src/xdisp.c (display_mode_line): Make 'mode-line-compact' apply
only to mode lines.  (Bug#51558)

Add manual section about how to avoid regexp problems

Help users affected by our NFA engine's stack overflows and occasional
poor performance, replacing old text that was more limited in scope.

* doc/lispref/elisp.texi (Top):
* doc/lispref/searching.texi (Regular Expressions): Add menu entries.
(Regexp Problems): New node.
(Regexp Special):
* etc/PROBLEMS: Remove superseded text.

Clarify build environment

* admin/nt/dist-build/README-scripts:

Clarify build directory structure

* admin/nt/dist-build/README-scripts: Clarify build directory structure

Improve theming of image-dired-thumb-mark

* etc/themes/adwaita-theme.el (adwaita):
* etc/themes/deeper-blue-theme.el (deeper-blue):
* etc/themes/dichromacy-theme.el (dichromacy):
* etc/themes/leuven-theme.el (leuven):
* etc/themes/manoj-dark-theme.el (manoj-dark):
* etc/themes/whiteboard-theme.el (whiteboard): Add definitions for
the 'image-dired-thumb-mark' face.

* src/image.c: Fix building with giflib 4.

image-dired: Improve marking behavior

* lisp/image-dired.el (image-dired-thumb-mark): Use DarkOrange as
background to better match the 'dired-marked' face.
(image-dired-show-all-from-dir): Disable all marks when entering a
full directory.
(image-dired-unmark-all-marks): Add mode tag.
(image-dired-thumbnail-mode-map): Bind 'image-dired-unmark-all-marks'
to "U".

image-dired: Cleanup of four commands

* lisp/image-dired.el
(image-dired--on-file-in-dired-buffer): New macro.
(image-dired-mark-thumb-original-file)
(image-dired-unmark-thumb-original-file)
(image-dired-flag-thumb-original-file)
(image-dired-toggle-mark-thumb-original-file): Rewrite using
above new macro.
(image-dired-modify-mark-on-thumb-original-file): Make obsolete in
favor of above new macro.

image-dired: Support wrap-around in display-next-thumbnail-original

* lisp/image-dired.el (image-dired-forward-image): Support negative
prefix argument.  Optionally wrap-around, which means to continue from
first image after reaching the last one and vice versa.
(image-dired-backward-image): Reimplement in terms of
'image-dired-forward-image'.
(image-dired-display-next-thumbnail-original)
(image-dired-display-previous-thumbnail-original): Wrap around; when
reaching the last image, continue from the first one.  Add optional
prefix argument to move more than one image at a time.

image-dired: Improve menus

* lisp/image-dired.el (image-dired-toggle-append-browsing)
(image-dired-toggle-movement-tracking): Improve messages.
(image-dired-thumbnail-mode-menu, image-dired-minor-mode-menu):
Make toggle entries into checkboxes.  Add separators.  Remove
obsoleted commands accidentally added back in merge.

image-dired: Signal error if file is missing on display

* lisp/image-dired.el (image-dired-display-image): Signal error if
file is missing.

image-dired: Move menu definitions to top level

* lisp/image-dired.el (image-dired-thumbnail-mode-map)
(image-dired-display-image-mode-map, image-dired-minor-mode-map):
Move menu definitions from here...
(image-dired-thumbnail-mode-menu)
(image-dired-display-image-mode-menu)
(image-dired-minor-mode-menu): ...to these new top level
definitions.

* lisp/epg.el (epg-key): Use explicit copier with proper prefix

(epg--filter-revoked-keys): Adjust sole use.

* etc/PROBLEMS: Move some entries to the legacy section.

Remove info for Emacs 20 users from etc/PROBLEMS

* etc/PROBLEMS: Remove information for users upgrading from Emacs
20 or older.

Optimise (cond) => nil at source level

* lisp/emacs-lisp/byte-opt.el (byte-optimize-cond):
Optimise clause-free `cond`, which can arise from earlier
transformations.  This enables further optimisations.
* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--test-cases):
Add test cases.

* src/pdumper.c (dump_do_dump_relocation): Add sanity check.

Use current face foreground for SVG icons in customize

* etc/images/down.svg:
* etc/images/left.svg:
* etc/images/right.svg:
* etc/images/up.svg: Don't define foreground; this means they will use
the foreground of the currently defined face instead.  (Bug#51556)

Merge from origin/emacs-28

bc58bea * lisp/progmodes/prog-mode.el (prog-context-menu): Use text-m...

; Merge from origin/emacs-28

The following commit was skipped:

e4e1a95 ; Auto-commit of loaddefs files.

; * doc/lispref/modes.texi (Tabulated List Mode): Fix markup.

Support inserting images in tabulated-list-mode columns

* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print-col):
Support using an image descriptor to insert an image in a column.
(tabulated-list-entries):
* doc/lispref/modes.texi (Tabulated List Mode): Update documentation
to reflect above change.

Revert overlay-related changes in `C-h b'

* lisp/help.el (describe-bindings): Revert overlay-related changes
-- these are already output (normally) by `describe-buffer-bindings'.

Make lambdas/closures/byte code in `C-h b' clickable

* lisp/help.el (help--describe-command): Add links for
lambdas/closures/byte code (bug#24235).

* lisp/emacs-lisp/pp.el (pp-display-expression): Autoload.

; Improve documentation of a recent change

* lisp/files.el (file-has-changed-p): TAG must be a symbol.

* doc/lispref/files.texi (File Attributes): Fix typos.

Improve file-has-changed-p

* doc/lispref/files.texi: Update the documentation.

* lisp/net/mailcap.el: Add a second argument to the call to
file-has-changed-p (bug#51523).

Update keymap-tests after recent changes

* test/src/keymap-tests.el
(help--describe-vector/bug-9293-one-shadowed-in-range): Update tests
for d530f3f9ff.
(help--describe-vector/bug-9293-same-command-does-not-shadow): Update
(bug#51567).

* lisp/outline.el: Fix compilation of `outline--make-button`

Fix mouse-1 on `C-h b' buttons

* lisp/outline.el (outline--make-button-overlay): Make mouse-1
work on the buttons.

Make `C-h b' also describe overlay keymaps

* lisp/help.el (describe-bindings): Also describe overlay key
bindings.

Add a better test for emojis

* lisp/outline.el (outline--valid-char-p)
(outline--valid-emoji-p): New predicates.
(outline--make-button, outline-minor-mode-buttons): Use them.

Make `C-h b' indentation more regular (and avoid continuation lines)

* lisp/help.el (help--describe-command): Don't do any indentation.
(describe-map): Store data about each section.
(describe-map--align-section): New function to do indentation on a
per-block basis.
(describe-map--fill-columns): Helper function.

Fix rendering of key translations

* lisp/help.el (help--describe-translation): Make obsolete.
(help--describe-command): Take an optional parameter to output key
translations.
(describe-map): Make optional parameters optional.

* lisp/progmodes/prog-mode.el (prog-context-menu): Use text-mode-context-menu.

Improve documentation of 'file-has-changed-p'

* etc/NEWS:
* doc/lispref/files.texi (File Attributes): Improve wording of the
documentation of 'file-has-changed-p'.

Don't output prefix keys in `C-h b', and output more data on objects

* lisp/help.el (help--describe-command): Output
[closure/lambda/byte-code] for those types of objects.
(describe-map): Don't output prefix keys.

Exclude emacs-module-tests.el on emba

* test/infra/gitlab-ci.yml (test-native-comp-speed0):
Exclude emacs-module-tests.el.

Add buttons to definition in help--describe-command

* lisp/help-mode.el (help-make-xrefs): Don't add buttons to
keymaps, because they're pre-buttonized.
* lisp/help.el (help--describe-command): Make buttons out of the
definitions.

Tag up last NEWS change

Read mailcaps again only when necessary

* doc/lispref/files.texi (File Attributes): Document it.

* lisp/files.el (file-has-changed-p): New function.
(file-has-changed-p--hash-table): Internal variable used by the
new function (bug#51523).
* lisp/emacs-lisp/shortdoc.el (file): Mention it.

* lisp/net/mailcap.el (mailcap-parse-mailcaps): Read mailcaps again
only when at least one of the mailcap files has changed.  Fixes
bug#51523.

; Auto-commit of loaddefs files.

; Auto-commit of loaddefs files.

; * lisp/faces.el (help-key-binding): Comment on recent change.

Merge from origin/emacs-28

84cd95e04c Fix bug#51369

Fix bug#51369

* test/lisp/net/dbus-tests.el (dbus-test04-register-method): Skip on hydra.

Merge from origin/emacs-28

ba4daf2214 Adapt arguments of `tramp-make-tramp-file-name'
a34466731b Fix typo in describe-map-tree doc string

Adapt arguments of `tramp-make-tramp-file-name'

* lisp/net/tramp-gvfs.el (tramp-gvfs-handler-mounted-unmounted):
* lisp/url/url-tramp.el (url-tramp-convert-url-to-tramp):
Use `make-tramp-file-name'.

* lisp/obsolete/rcompile.el (remote-compile): Pacify byte-compiler.

Further xref fix-ups after keymap help changes

* lisp/help-mode.el (help-make-xrefs): Get continuation lines right.

Fix infloop in help-make-xrefs in certain keymaps

* lisp/help-mode.el (help-make-xrefs): Adjust xref symbol finding
after changes to how keymaps are output.

Make xref symbol marking work again after describe-keymap changes

* lisp/help-mode.el (help-make-xrefs): Adjust xref symbol finding
after changes to how keymaps are output.

* lisp/icomplete.el (icomplete-exhibit): Remove workaround

Fix failing help-fns tests after layout changes in `C-h b'

Say "Key/Binding" instead of "key/binding" in `C-h b'

* lisp/help.el (describe-map-tree): Capitalize the heading.

Don't print empty keymaps in `C-h b'

* lisp/help.el (describe-map-tree): Don't print the heading if the
keymap is empty (bug#22334).  Tweak the look to compress it more
vertically.

Fix typo in describe-map-tree doc string

* lisp/help.el (describe-map-tree): Fix typo in doc string.

Include the major mode name in the `C-h b' output

* lisp/calc/calc-help.el (calc-describe-bindings): Don't add the
name since it's there now.

* src/keymap.c (Fdescribe_buffer_bindings): Include the major mode
name for symmetry with the minor modes (and because it's easy to
forget).

Don't make key binding face wider than the norm

* lisp/faces.el (help-key-binding): Don't make the chars wider
than normally, because that makes `C-h b' lining-up logic fail.

Merge from origin/emacs-28

6ba4e3b78c Drop support for native compilation on 32-bit Cygwin
7e15ee5bc9 ; * doc/emacs/help.texi (Help Mode): Improve indexing.

Drop support for native compilation on 32-bit Cygwin

* configure.ac (cygwin32-native-compilation): New option.
[i686-pc-cygwin]: Don't allow native compilation unless that
option is specified.  (Bug#50666)

Re-fix the new mouse event logic in outline

* lisp/outline.el (outline-show-subtree, outline-hide-subtree):
Really fix the mouse logic.

Make TAB work on the outline buttons

* lisp/outline.el (outline--insert-close-button)
(outline--insert-open-button): Make TAB work to toggle on the
buttons, too.

Clarify describe-bindings code slightly

* lisp/help.el (describe-bindings): Clarify code slightly.

Fix new mouse handling in outline

* lisp/outline.el (outline-show-subtree, outline-hide-subtree):
Don't set point if we have no event.

Add buttons to outlining and tweak `C-h b' buffer

* lisp/help.el (describe-bindings-outline): Change default to t.
(describe-bindings): Tweak the look and remove the explanation.

* lisp/outline.el (outline-minor-mode-use-buttons):
(outline-minor-mode-buttons): New user options.
(outline-hide-subtree): Update buttons.
(outline--make-button, outline--make-button-overlay)
(outline--insert-open-button, outline--insert-close-button)
(outline--fix-up-all-buttons): New functions.

Improve the "Help Mode" section of the Emacs manual

* doc/emacs/help.texi (Help Mode): Reorganize and improve wording
of the recent change.  Add index entries.

; * doc/emacs/help.texi (Help Mode): Improve indexing.

; * nextstep/templates/Info.plist.in: Prefer HTTPS.

Add mode tagging to previously added help commands

* lisp/help-mode.el (help-goto-previous-page): New command and key
binding.
(help-goto-previous-page): Ditto.

Add 'n'/'p' key bindings in *Help* buffers

* lisp/help-mode.el (help-goto-previous-page): New command and key
binding.
(help-goto-previous-page): Ditto.

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Merge from origin/emacs-28

f1c9286 ; * doc/misc/org.org: fix capture context example
af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emac...
610680a Fix rendering of title-less <abbr> tags in shr
2ba4ccf ; * lisp/files.el (make-nearby-temp-file): Doc fix.

; Merge from origin/emacs-28

The following commit was skipped:

e170a31 Avoid signaling errors in lookup-key

Merge from origin/emacs-28

5e05be5 Fix localized display of date and time in the NS port

Adapt emba control files

* test/infra/Dockerfile.emba: Do not generate debug info.

* test/infra/gitlab-ci.yml (variables, default): Revert timeout
back to three hours.
(.job-template): Comment test prints.
(test-all-inotify): Exclude emacs-module-tests.el.

Add highlighting of the F2008 keyword "impure"

* lisp/progmodes/f90.el (f90-keywords-re): Highlight F2008 keyword
"impure" (bug#51529).

; * src/font.c (Ffont_has_char_p): Minor stylistic changes; doc fix.

Add new function 'font-has-char-p'

* src/font.c (Ffont_has_char_p): New function.
(Ffont_get_glyphs): Link to the new function from the doc string.

Add test for Bug#51527

* test/src/keymap-tests.el (keymap-lookup-key/menu-non-symbol):
New test.

; * doc/misc/org.org: fix capture context example

* doc/misc/org.org (Templates in contexts): Add missing parenthesis to
code example for org-capture template contexts as documented in
docstring.

Copyright-paperwork-exempt: yes (bug#51524).

Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28