1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 06:31:13 -08:00
Commit graph

151369 commits

Author SHA1 Message Date
Philipp Stephani
4422ed2c19 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.
2021-11-03 21:48:13 +01:00
Eli Zaretskii
44c4139dfb 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.
2021-11-03 20:50:34 +02:00
Eli Zaretskii
f78c819d95 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.
2021-11-03 20:26:29 +02:00
Eli Zaretskii
3e4eb54db4 ; * etc/PROBLEMS: Minor copyedits of the last change. (Bug#51571) 2021-11-03 20:23:58 +02:00
Daniel Martín
35bc2117de Document a macOS error message when opening Emacs
* etc/PROBLEMS: Document a potential error message when opening Emacs
on macOS for the first time.
2021-11-03 20:20:03 +02:00
Eli Zaretskii
d8523060e5 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)
2021-11-03 20:13:04 +02:00
Eli Zaretskii
5152727530 Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs 2021-11-03 16:14:28 +02:00
Eli Zaretskii
324fd9d105 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.
2021-11-03 16:13:32 +02:00
Harald Jörg
a25e91593d ; 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
2021-11-03 15:12:39 +01:00
Eli Zaretskii
0091398af9 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)
2021-11-03 16:02:15 +02:00
Eli Zaretskii
4df9998564 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)
2021-11-03 14:57:51 +02:00
Mattias Engdegård
81915a95af 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.
2021-11-03 13:50:12 +01:00
Phillip Lord
a16e66c681 Clarify build environment
* admin/nt/dist-build/README-scripts:
2021-11-03 11:03:00 +00:00
Phillip Lord
6ab6b2f1c8 Clarify build directory structure
* admin/nt/dist-build/README-scripts: Clarify build directory structure
2021-11-03 10:30:02 +00:00
Stefan Kangas
4ddaed34c9 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.
2021-11-03 08:22:29 +01:00
YAMAMOTO Mitsuharu
42a7ee5c71 * src/image.c: Fix building with giflib 4. 2021-11-03 16:17:15 +09:00
Stefan Kangas
f1770a68ae 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".
2021-11-03 08:02:56 +01:00
Stefan Kangas
73c3d622a8 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.
2021-11-03 07:02:13 +01:00
Stefan Kangas
16b46b9ee2 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.
2021-11-03 05:10:24 +01:00
Stefan Kangas
67af04403c 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.
2021-11-03 05:10:24 +01:00
Stefan Kangas
09a38b021b image-dired: Signal error if file is missing on display
* lisp/image-dired.el (image-dired-display-image): Signal error if
file is missing.
2021-11-03 05:10:24 +01:00
Stefan Kangas
91b6f49cdd 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.
2021-11-03 05:10:24 +01:00
Stefan Monnier
73eafa5d89 * lisp/epg.el (epg-key): Use explicit copier with proper prefix
(epg--filter-revoked-keys): Adjust sole use.
2021-11-02 22:17:02 -04:00
Stefan Kangas
8206e418f3 * etc/PROBLEMS: Move some entries to the legacy section. 2021-11-02 23:54:40 +01:00
Stefan Kangas
d8d1e673dd Remove info for Emacs 20 users from etc/PROBLEMS
* etc/PROBLEMS: Remove information for users upgrading from Emacs
20 or older.
2021-11-02 23:40:56 +01:00
Mattias Engdegård
493fde95be 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.
2021-11-02 22:46:20 +01:00
Andrea Corallo
9d6162053e * src/pdumper.c (dump_do_dump_relocation): Add sanity check. 2021-11-02 21:05:34 +01:00
Stefan Kangas
11702a6dd7 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)
2021-11-02 20:14:13 +01:00
Eli Zaretskii
f2b8f29920 Merge from origin/emacs-28
bc58bea * lisp/progmodes/prog-mode.el (prog-context-menu): Use text-m...
2021-11-02 19:06:05 +02:00
Eli Zaretskii
49e61878e2 ; Merge from origin/emacs-28
The following commit was skipped:

e4e1a95 ; Auto-commit of loaddefs files.
2021-11-02 19:06:03 +02:00
Eli Zaretskii
cd311e2246 ; * doc/lispref/modes.texi (Tabulated List Mode): Fix markup. 2021-11-02 18:51:35 +02:00
Stefan Kangas
2612488c36 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.
2021-11-02 17:44:57 +01:00
Lars Ingebrigtsen
093234f845 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'.
2021-11-02 17:34:47 +01:00
Lars Ingebrigtsen
cd73ec72a6 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.
2021-11-02 16:20:19 +01:00
Eli Zaretskii
4f851c2357 ; 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.
2021-11-02 17:09:05 +02:00
Gregory Heytings
53a9a2de45 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).
2021-11-02 15:50:31 +01:00
dickmao
ff5327d72a 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).
2021-11-02 15:28:52 +01:00
Stefan Monnier
33263b610e * lisp/outline.el: Fix compilation of outline--make-button 2021-11-02 08:29:32 -04:00
Lars Ingebrigtsen
ec60aededd Fix mouse-1 on `C-h b' buttons
* lisp/outline.el (outline--make-button-overlay): Make mouse-1
work on the buttons.
2021-11-02 03:50:36 +01:00
Lars Ingebrigtsen
8cb514f4a2 Make `C-h b' also describe overlay keymaps
* lisp/help.el (describe-bindings): Also describe overlay key
bindings.
2021-11-02 03:35:10 +01:00
Lars Ingebrigtsen
ee3e4d0ca2 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.
2021-11-02 02:52:29 +01:00
Lars Ingebrigtsen
d530f3f9ff 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.
2021-11-02 02:36:49 +01:00
Lars Ingebrigtsen
8b74649407 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.
2021-11-02 01:07:44 +01:00
Juri Linkov
bc58bea371 * lisp/progmodes/prog-mode.el (prog-context-menu): Use text-mode-context-menu. 2021-11-01 22:08:36 +02:00
Eli Zaretskii
dfc89318ce 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'.
2021-11-01 17:09:52 +02:00
Lars Ingebrigtsen
a5d79fcfe8 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.
2021-11-01 16:06:21 +01:00
Michael Albinus
aa90de71a2 Exclude emacs-module-tests.el on emba
* test/infra/gitlab-ci.yml (test-native-comp-speed0):
Exclude emacs-module-tests.el.
2021-11-01 16:00:06 +01:00
Lars Ingebrigtsen
8c215fd4c9 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.
2021-11-01 15:42:30 +01:00
Lars Ingebrigtsen
81f12bb777 Tag up last NEWS change 2021-11-01 14:53:35 +01:00
Gregory Heytings
daea9b3b44 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.
2021-11-01 14:51:57 +01:00