1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-08 06:12:14 -07:00
Commit graph

182157 commits

Author SHA1 Message Date
Sean Whitton
876a1db6ee Merge from origin/emacs-31
2d496b842d ; Fix Gregor Schmid's attribution for lua-mode.el.
69c50dcb47 ; package-activate-all: Drop requiring package now not pr...
f94637749a vc-switch-working-tree: Use project-current again
060451d6e0 treesit-explore-mode usability improvements (bug#80935)
48b064a2aa Fix 'vc-dir-resynch-file' again (bug#80967)
2026-05-08 13:48:22 +01:00
Sean Whitton
2d496b842d ; Fix Gregor Schmid's attribution for lua-mode.el. 2026-05-08 13:47:52 +01:00
Sean Whitton
69c50dcb47 ; package-activate-all: Drop requiring package now not preloaded. 2026-05-08 12:27:24 +01:00
Dmitry Gutov
f94637749a vc-switch-working-tree: Use project-current again
* lisp/vc/vc.el (vc-switch-working-tree): Use project-current
instead of manually constructing VC project objects.
2026-05-08 12:25:49 +01:00
Michael Albinus
5e0b4b96bc ; Adapt files in admin/notes for emacs-31 branch
* admin/notes/emba: Mention scheduled pipelines.

* admin/notes/git-workflow: Adapt for emacs-31 branch.
2026-05-08 10:47:26 +02:00
Eli Zaretskii
730d3884dc ; Fix the build broken by a typo in configure.ac
* configure.ac (module_env_snippet_32): Fix typo.
2026-05-08 09:51:13 +03:00
Stéphane Marks
060451d6e0
treesit-explore-mode usability improvements (bug#80935)
Improve the usability of treesit-explore-mode.

- Prompt for the primary parser first, if there is one, rather
than the first in the list reported by 'treesit-parser-list'.
Previously, in a multi-parser buffer like 'markdown-ts-mode', one
had to hunt for the primary parser.

- Kill the tree buffer and its window if the source buffer is
killed or 'treesit-explore-mode'.  Previously, when
'treesit-explore-mode' is disabled in the source buffer, its
companion explorer tree buffer was left dangling and window
open (with an unrelated buffer).

- Improve 'treesit--explorer-refresh-1' to recenter the window
around the selected nodes when the selected region in the source
buffer changes.  Previously, one had to navigate manually to find
the corresponding highlighted node in the tree window which may
be far away from that the source buffer's region represents.

- Disable 'treesit-explore-mode' in the source buffer if its
companion tree buffer is killed.  Previously,
'treesit-explore-mode' remained active in the source buffer in
an effectively unusable state.

- Disable 'treesit-explore-mode' if the user quits
'completing-read' in 'treesit-explorer-switch-parser' when
enabling the mode.  Previously, 'treesit-explore-mode' was left
enabled after quit.

- New command to switch back and forth between the source buffer
and tree buffer windows to make navigating more convenient.
Previously, in a multi-window frame, one had to navigate to/from
these two related windows in a more cumbersome way.

- New command to quit 'treesit-explore-mode' and
'treesit--explorer-tree-mode' and handle buffer and window
cleanup.

* lisp/treesit.el (treesit--explorer-refresh-1): Recenter the
window, if amenable, to the node selected in the source buffer.
(treesit--explorer-kill-explorer-buffer): Remove function.
(treesit--explorer-generate-parser-alist): Prioritize the
primary parser, if there is one.
(treesit--explorer-tree-mode-cleanup): New defun.
(treesit-explore-quit): New command.
(treesit-explorer-tree-window): New defun.
(treesit-explorer-source-buffer-window): New defun.
(treesit-explore-mode-map): Revise key bindings.
(treesit--explorer-tree-mode-map): Revise key bindings.
(treesit--explorer-tree-mode): New keymap.
(treesit-explorer-switch-parser): Add a default to
completing-read.
(treesit-explore-mode): Guard completing read quit.  Wire up the
new cleanup functions.
2026-05-07 21:35:46 -07:00
João Távora
48b064a2aa Fix 'vc-dir-resynch-file' again (bug#80967)
This unbreak project-vc-dir for dirs under non-truename
hierarchies.

The following commit presumably makes 'M-x vc-dir' usable again
for versioned directories inside non-truename hierarchies,

   commit e05fab5775
   Author: Stephen Berman <stephen.berman@gmx.net>
   Date:   Sat May 2 15:11:37 2026 +0200

       Fix 'vc-dir-resynch-file' (bug#80803)

       * lisp/vc/vc-dir.el (vc-dir-resynch-file): Apply 'file-truename'
       instead of 'expand-file-name' to FNAME argument to prevent
       spurious display of symlinked files in *vc-dir* buffer.

However the similar command 'M-x project-vc-dir' was broken and made
unusable in similar circumstances.

This relatively simple fix addresses both situations touching only the
problematic 'vc-resynch-file' and one of its callees,
'vc-dir-recompute-file-state', which now discerns clearly between the
short/familiar name to present in the list and the "fname" to use to
call into the backend to gather the VC state.  Since this function is
also called from another context, where the requirements are less clear,
keeping current smenatics in that situation seemed prudent, so the new
behaviour is activate with a new optional parameter.

* lisp/vc/vc-dir.el (vc-dir-resynch-file): Call
vc-dir-recompute-file-state with truename=t.
(vc-dir-recompute-file-state): Accept optional truename param.
2026-05-07 22:15:42 +01:00
Sean Whitton
90f8f27a58 Merge from origin/emacs-31
8d0bf280a6 ; * ChangeLog.5: Some fixes and tidying up.
1ec79b48f3 ; Update exported ChangeLog files and etc/AUTHORS
991f6100eb ; * admin/make-tarball.txt: Suggest load-file, not require.
3c6c3f5a69 ; Fix two file headers misunderstood by authors.el.
2026-05-07 20:15:39 +01:00
Sean Whitton
868fd126ae ; Merge from origin/emacs-31
The following commit was skipped:

311f1fe2ba Cut the emacs-31 release branch
2026-05-07 20:15:39 +01:00
Sean Whitton
8d0bf280a6 ; * ChangeLog.5: Some fixes and tidying up. 2026-05-07 20:14:12 +01:00
Sean Whitton
1ec79b48f3 ; Update exported ChangeLog files and etc/AUTHORS
There are still unfixed problems in *Authors Errors*.

* ChangeLog.3: Fix typos.
* ChangeLog.5: Export from VCS history.
* Makefile.in: Update PREFERRED_BRANCH.
* admin/authors.el (authors-aliases, authors-ignored-files)
(authors-valid-file-names, authors-renamed-files-alist): Add
some entries.
* etc/AUTHORS: Regenerate.
2026-05-07 20:08:43 +01:00
Sean Whitton
991f6100eb ; * admin/make-tarball.txt: Suggest load-file, not require. 2026-05-07 20:04:26 +01:00
Sean Whitton
3c6c3f5a69 ; Fix two file headers misunderstood by authors.el. 2026-05-07 20:04:04 +01:00
Sean Whitton
ddde687b3f ; * admin/admin.el (set-version): Fix punctuation. 2026-05-07 17:46:57 +01:00
Sean Whitton
0d287aa276 Bump master Emacs version to 32.0.50
* README:
* configure.ac:
* etc/refcards/ru-refcard.tex:
* exec/configure.ac:
* java/AndroidManifest.xml.in (Version-code):
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 32.0.50.
* etc/NEWS: Empty for Emacs 32.
* lisp/cus-edit.el (customize-changed-options-previous-release):
Set last version to 31.1.
* src/emacs-module.in.h (struct emacs_env_32): Add.
* src/module-env-31.h: Remove header comment.
* src/module-env-32.h: New file.
2026-05-07 17:46:43 +01:00
Sean Whitton
edd345c33f ; Move etc/NEWS to etc/NEWS.31. 2026-05-07 17:40:24 +01:00
Sean Whitton
311f1fe2ba Cut the emacs-31 release branch
* README:
* configure.ac:
* exec/configure.ac:
* java/AndroidManifest.xml.in (Version-code):
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 31.0.60.
* lisp/cus-edit.el (customize-changed-options-previous-release):
Set last version to 30.2.
2026-05-07 17:38:20 +01:00
Zeke Dou
2f73996647 Move ns_init_colors() after init_callproc() (bug#80752)
'data-directory' needs to be established in advance of 'ns_init_colors'
to ensure the file "etc/rgb.txt" is read.  This was encountered on an
out-of-tree Nix build.

* src/emacs.c (main): Move the 'ns_init_colors' after 'init_callproc'.

Copyright-paperwork-exempt: yes
2026-05-07 17:32:02 +01:00
Eli Zaretskii
a9064bfdd9 ; * lisp/term/x-win.el (icon-map-list): Fix :type (bug#80982) 2026-05-07 19:05:39 +03:00
Jonas Bernoulli
f833e560c1
Update to Transient v0.13.3-10-g87d0ca08 2026-05-07 17:35:17 +02:00
Eli Zaretskii
4beb8e8963 Fix infloop in redisplay due to continuation glyphs
* src/xdisp.c (display_line): When inserting continuation glyphs,
account for the border glyph in non-rightmost windows on TTY
frames.  (Bug#80975)
2026-05-07 17:45:19 +03:00
Sean Whitton
fdab8a9185 ; Revert Eric's commits from February.
These will be resubmitted as patches for review.

Revert "Repair another test bollixed by aggressive optimization."
This reverts commit 47735e0243.

Revert "Repair ab ecal test by making a variable kexical,"
This reverts commit ca42055b0c.

Revert "Complete the test set for floatfns,c."
This reverts commit 1b0c8d6b95.

Revert "Tesrts for the portable primitives in fileio.c."
This reverts commit a339c6827c.

Revert "Tests for primitives in coding.c and charset.c."
This reverts commit 5749b2e4f4.

Revert "Tests for primitives from the character.c module."
This reverts commit b09f8df206.

Revert "Tests for the lreaf.c amd print.c primitives."
This reverts commit d7a3d442b4.

Revert "Tests for remaining functions iun eval.c."
This reverts commit cd038e5617.

Revert "Completing test coverage for dataa.c orimitives."
This reverts commit a6e19d6179.

Revert "More correctness tesrs for orinitives from fns.c."
This reverts commit 40ff4512ad.

Revert "More tests for edit functions, buffers, and markers."
This reverts commit 67e8f87562.

Revert "Added more buffer/marker/editing test coverage."
This reverts commit 3dda4b85e8.

Revert "Category/charset/coding + char-table tests."
This reverts commit 7a93a7b334.

Revert "More test coverage improvements."
This reverts commit fc7339c46d.

Revert "More test coverage improvements."
This reverts commit 95329bf445.

Revert "More test coverage improvements for ERT."
This reverts commit e42c579a54.

Revert "Crrections to tedt coverrage extensuion after bootstrap build."
This reverts commit 90af3295c7.

Revert "Improve test coverage of builtin predicates."
This reverts commit 6eb170b007.

Revert "Tests for 2 marker primitives previously not covered."
This reverts commit 6d7f0acf9c.

Revert "Tests for 7 editor primitives previously not covered."
This reverts commit bb403e70ae.
2026-05-07 15:29:53 +01:00
Sean Whitton
838fc3547a ; * doc/emacs/emacs.texi (Acknowledgments): Fill. 2026-05-07 15:20:03 +01:00
Sean Whitton
174f75f888 ; Fixes to Acknowledgments lists. 2026-05-07 15:20:03 +01:00
Sean Whitton
0c51be894f Unpreload package-activate-all
See <https://debbugs.gnu.org/80079#49> for my reasoning.

* lisp/emacs-lisp/package-activate.el (package-activate-all):
Unpreload.
2026-05-07 14:12:25 +01:00
Dmitry Gutov
f20e3e473d [GTK3] Move the frame to position before showing
* src/xterm.c (x_make_frame_visible): Move XMoveWindow call before
gtk_widget_show_all, so that the move happens before the frame
become visible (bug#80662).
2026-05-07 06:27:27 +03:00
Dmitry Gutov
6c3dc7aafd [GTK3] Improve the resize -> hide -> show scenario
* src/gtkutil.c (xg_frame_set_char_size)
(xg_frame_set_size_and_position): Call gtk_window_resize for
child frames too, to record _GtkWindowGeometryInfo#resize_width
and resize_height.  They are later looked up by
gtk_widget_show_all in x_make_frame_visible (bug#80662).
Without this the widgets go back and forth between the
remembered and actual sizes after make-visible.
2026-05-07 06:27:27 +03:00
Stéphane Marks
581db34a77 ; Fix crash in macOS Accessibility Zoom timer (bug#80624)
* src/nsterm.m (cancel_ns_deferred_UAZoomChangeFocus_timer): New function.
([EmacsView windowWillClose:]): New method. Cancel the timer if the window
closes before it runs.
([EmacsView deferredhandler:]): Guard against emacsframe being deleted before
the timer runs.
2026-05-06 23:17:09 +01:00
Eli Zaretskii
187efe4e31 ; * lisp/emacs-lisp/elisp-scope.el (elisp-scope-analyze-form): Doc fix. 2026-05-06 18:54:09 +03:00
Eshel Yaron
39e1505683
; Expand 'elisp-fontify-symbol' and 'elisp-scope-analyze-form' docs
See discussion at
https://yhetil.org/emacs/868q9wag3h.fsf@gnu.org/

* lisp/progmodes/elisp-mode.el (elisp-fontify-symbol):
* lisp/emacs-lisp/elisp-scope.el (elisp-scope-analyze-form):
Expand docstring.
2026-05-06 16:10:33 +02:00
Michael Albinus
eae96d9fcb Handle long environment variables in Tramp oricesses
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process):
Handle loooong environment variables.  (Bug#80783)

* test/lisp/net/tramp-tests.el (tramp-test33-environment-variables):
Adapt test.
2026-05-06 16:06:50 +02:00
Eli Zaretskii
dfc7cf8e41 ; * etc/NEWS (margin): Fix a typo, improve wording, move to proper place. 2026-05-06 14:48:28 +03:00
Eli Zaretskii
d962c83aa3 ; Improve doc strings of several Help-related user options
* lisp/help-fns.el (help-enable-completion-autoload)
(help-enable-symbol-autoload):
* lisp/help.el (help-enable-autoload): Doc fixes.
2026-05-06 14:19:50 +03:00
Yuan Fu
61e9dfe5f7
; * lisp/treesit.el (treesit--update-ranges-local): Fix let-binding. 2026-05-05 19:24:17 -07:00
Dmitry Gutov
14f17722aa Fix flicker of child frame right after make-frame-visible
* src/xterm.c (x_make_frame_visible): Call SET_FRAME_GARBAGED
before making a child frame visible (bug#80943).
2026-05-06 04:31:50 +03:00
Stefan Monnier
930f298f4d (help--symbol-completion-table): Try and fix bug#80873
* lisp/help-fns.el (help--symbol-completion-table): Don't let
`test-completion` pretend that `definition-prefixes` are
actually valid function names.
2026-05-05 16:42:28 -04:00
Basil L. Contovounesios
b3b2b3de5d ; * etc/NEWS: Fix typo in recent change. 2026-05-05 21:23:07 +02:00
Eli Zaretskii
a3f79f9da1 ; * lisp/progmodes/elisp-mode.el (elisp-fontify-semantically): Fix typo. 2026-05-05 21:40:48 +03:00
Eshel Yaron
b57124b747
; More 'elisp-scope' and 'elisp-fontify-semantically' doc improvements
See discussion at
https://yhetil.org/emacs/86y0hy9e6g.fsf@gnu.org/

* lisp/emacs-lisp/elisp-scope.el (elisp-scope-analyze-form):
Add example in docstring.
* lisp/progmodes/elisp-mode.el (elisp-fontify-semantically):
Clarify use of 'cursor-sensor-mode'.
2026-05-05 19:10:45 +02:00
Juri Linkov
c9078c505b Improve 'context-menu-send-to' (bug#79512)
* lisp/mouse.el (context-menu-functions): Add missing
'context-menu-send-to' to :type.
(context-menu-send-to): Get non-nil items to avoid
useless message "Nothing to send".

* lisp/send-to.el (send-to-handlers): Change from
'defvar-local' to 'defvar' to allow easier global configuration.
(send-to-supported-p): Check for non-nil handler.
2026-05-05 19:45:28 +03:00
Eshel Yaron
0649c501ad
; (elisp-scope-analyze-form): Improve docstring. 2026-05-05 14:30:59 +02:00
Sean Whitton
283b47ab2e vc-switch-working-tree: Don't find non-VC projects
* lisp/vc/vc.el (project-current-directory-override):
Delete declaration.
(project-find-matching-buffer-function): Declare.
(vc-switch-working-tree):
Don't find non-VC projects (bug#80939).
2026-05-05 12:17:53 +01:00
Sean Whitton
8f9607d532 vc-finish-logentry: Skip displaying async command buffer sometimes
* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Don't display
the async command buffer if vc-display-failed-async-commands is
non-nil.
2026-05-05 11:00:52 +01:00
Eshel Yaron
5789621632
elisp-mode: Cache 'help-echo' function results (bug#80948)
This ensures we only compute the 'help-echo' string once per
symbol in a certain position.

* lisp/progmodes/elisp-mode.el
(elisp--annotate-symbol-with-help-echo): Add caching for
when the symbol role's :help property is a function.
2026-05-05 11:19:30 +02:00
Eshel Yaron
288f8d0b05
; (elisp-fontify-symbol): Improve docstring. 2026-05-05 11:19:30 +02:00
Eli Zaretskii
47e014ff90 ; Fix byte-compilation warnings in markdown-ts-mode
* lisp/textmodes/markdown-ts-mode-x.el: Use
'treesit-declare-unavailable-functions'.

* lisp/treesit.el (treesit-declare-unavailable-functions): Add
declaration.
2026-05-05 11:42:12 +03:00
Eli Zaretskii
d48b774524 ; Fix last change
* src/xdisp.c (extend_face_to_end_of_line): Fix last argument to
'append_stretch_glyph', to avoid assertion violations.  (Bug#80693)
2026-05-05 11:22:56 +03:00
Andrea Alberti
d24b10ca75 Introduce 'margin' face for window margin background
A new basic face 'margin' is used for text displayed in the left and
right margin areas, i.e., the areas typically used by VCS and LSP
packages for per-line annotations.  Its background defaults to the
frame default, preserving existing behavior for users who do not
customize it.
* etc/NEWS: Document the new 'margin' face.
* lisp/faces.el (margin): Add 'margin' face, inheriting from 'default'.
* src/dispextern.h (face_id): Add MARGIN_FACE_ID.
* src/xdisp.c (face_at_pos): Use 'margin' as the base face for
strings displayed in margin areas so that they inherit the gutter
background by default.
(extend_face_to_end_of_line): Compute 'margin_fill_face_id' from the
'margin' face.  Use while loops to explicitly fill all empty character
slots in both left and right margins for both GUI and TTY branches.
(display_line): Call 'extend_face_to_end_of_line' for beyond-EOB rows
when the window has margins.  Also extend the existing condition for
text rows with empty margins to trigger when the 'margin' face
background differs from the frame default, not only when the default
face is remapped.
* src/xfaces.c (realize_basic_faces): Realize 'margin' as a basic
face to support face-remapping and efficient lookup.
(Bug#80693)
2026-05-05 11:21:57 +03:00
Augusto Stoffel
c878753d39 Accept stream type as 4th argument of X-Message-SMTP-Method header
* lisp/gnus/message.el (message-multi-smtp-send-mail): Set
'smtpmail-stream-type' if specificed in the header.
* doc/misc/message.texi (Mail Variables): Document that.
(Bug#80880)
2026-05-05 10:28:25 +03:00