Update from upstream repo emacs-mirror/emacs@master #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix font lock and indentation in js-ts-mode when the tree-sitter grammar is automatically installed (Bug#79363). * lisp/progmodes/js.el (js--treesit-indent-rules) (js--treesit-font-lock-settings): Evaluate the rules only after the tree-sitter grammar is installed. (js-ts-mode): Call the new `js--treesit-indent-rules' and `js--treesit-font-lock-settings' functions.
* lisp/ffap.el (ffap-latex-mode): Starting with TeXlive 2025, the kpsewhich utility may return blank lines before the first valid path for `ffap'. The old behavior of `ffap-latex-mode' was to simply return the first line of output from kpsewhich (if the output was nonempty). The fix simply skips all \r and \n chars. (Bug#79397) Copyright-paperwork-exempt: yes
* lisp/vc/vc.el (vc--prompt-other-working-tree): When there are no other working trees, signal an error.
* lisp/vc/vc-git.el (vc-git-patch-string): Delete. All uses changed. (vc-git--checkin): Rename vc-git-checkin to this. (vc-git-checkin-patch, vc-git-checkin): New wrapper functions.
* lisp/vc/vc-hooks.el(vc-diff-outgoing-base) (vc-root-diff-outgoing-base, vc-apply-to-other-working-tree) (vc-apply-root-to-other-working-tree): Declare.
* test/lisp/autorevert-tests.el (auto-revert-test05-global-notify) (auto-revert-test07-auto-revert-several-buffers): Adapt tests. * test/src/comp-resources/comp-test-funcs.el (foo): Define error symbol.
* src/bytecode.c (exec_byte_code): Reset quitcounter to 1 after longjmp; the exact value isn't important. This may reduce register pressure a tiny bit or at least remove a useless stack slot.
(mhtml-ts-mode--treesit-font-lock-settings): Replace variable 'js--treesit-font-lock-settings' with the function call. (mhtml-ts-mode--treesit-indent-rules): Replace variable 'js--treesit-indent-rules' with the function call (bug#79363).
This value forces a quit check at the next backward branch, to avoid rare situations being hard to interrupt. Suggested by Pip Cet.
* lisp/minibuffer.el (minibuffer-nonselected): New face. (minibuffer-nonselected-overlay): New buffer-local variable. (minibuffer-nonselected-check, minibuffer-nonselected-setup): New functions. (minibuffer-nonselected-mode): New command (bug#49844).
This fixes bug#79438. * lisp/progmodes/cc-align.el (c-lineup-class-field-cont): New function. * lisp/progmodes/cc-vars.el (c-offsets-alist): Change the entry for class-field-cont from + to c-lineup-class-field-cont. * doc/misc/cc-mode.texi (Misc Line-Up): Add a new entry for c-lineup-class-field-cont.
… on Android * src/android.c (android_set_dashes): Always release local reference to dash array even when it was returned by GetObjectField.
* lisp/help-fns.el (help-fns-function-description-header): If a function type symbol begins with a vowel, precede it with the article "an" instead of "a". To date this only prevents displaying "a interpreted-function", and it's susceptible to future false positives (bug#79469).
* doc/lispref/processes.texi (Accepting Output): * src/process.c (Faccept_process_output): Document better the meaning of the timeout of 'accept-process-output' a,d the fact that it doesn't always return as soon as some output is available. See https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00750.html for more details.
* lisp/shell.el (shell-eval-command): Instead of always taking the last element from the shell-dirtrack-query command, first try selecting the last directory. (Bug#79441)
* doc/emacs/programs.texi (Hideshow): Update documentation. * etc/NEWS: Announce changes. * lisp/progmodes/hideshow.el (hs-show-indicators) (hs-indicator-type, hs-indicator-maximum-buffer-size): New user options. (hs-indicator-hide, hs-indicator-show): New icons. (hs-block-positions, hs--make-indicators-overlays) (hs-indicator-mouse-toggle-hidding, hs--add-indicators) (hs--refresh-indicators): New functions. (hs-hide-block-at-point): Use hs-block-positions. (hs-inside-comment-p): Use 'get-char-property' instead of 'hs-overlay-at'. (hs-minor-mode): Rework.
* etc/NEWS: * doc/emacs/programs.texi (Hideshow): Fix wording and punctuation.
* lisp/dabbrev.el (dabbrev-capf): Call 'dabbrev--reset-global-variables' if necessary. (Bug#61274)
159ad91 ; Add Richard Stallman to admin/MAINTAINERS.
* lisp/register.el (register-preview): Sort alist returned from `register-of-type-alist'. (Bug#79474)
(js--treesit-sexp-nodes): Set the default value to nil and make obsolete. (js--treesit-thing-settings): Instead of using 'js--treesit-sexp-nodes', define a list of named and anonymous nodes that don't match the 'sexp' thing (bug#79465).
* lisp/minibuffer.el (minibuffer-nonselected-setup): Use window-buffer-change-functions in addition to window-selection-change-functions to detect changes from one recursive minibuffer to another within the same minibuffer-window. (minibuffer-nonselected-check): Ensure that the target minibuffer is current before checking/deleting the overlay (bug#79472).
Fix font lock in mhtml-ts-mode when the required tree-sitter grammars are automatically installed (bug#79363). Also, cache tree-sitter indent rules. * lisp/textmodes/mhtml-ts-mode.el (mhtml-ts-mode--treesit-font-lock-settings): Evaluate the rules only after the tree-sitter grammars are installed. (mhtml-ts-mode--treesit-indent-rules): Cache indent rules. (mhtml-ts-mode): Call the new `mhtml-ts-mode--treesit-font-lock-settings' function.
* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--indent-rules) (cmake-ts-mode--indent-rules-cached, cmake-ts-mode--font-lock-settings) (cmake-ts-mode--font-lock-settings-cached): * lisp/progmodes/go-ts-mode.el (go-ts-mode--font-lock-settings) (go-ts-mode--font-lock-settings-cached): * lisp/progmodes/js.el (js--treesit-indent-rules) (js--treesit-indent-rules-cached, js--treesit-font-lock-settings) (js--treesit-font-lock-settings-cached): Suffix tree-sitter cache variables with "-cached" (bug#79363).
bug#79580 * lisp/progmodes/hideshow.el (hs--make-indicators-overlays): Add 'cursor' property to the EOL indicator, so it will not conflict with flymake EOL indicators.
* src/w32fns.c (EMACS_TRAY_NOTIFICATION_ID_INIT): Rename from EMACS_TRAY_NOTIFICATION_ID; all users adjusted. (last_tray_notification_id): New static variable. (add_tray_notification): Advance 'last_tray_notification_id' for each new notification; wrap around to the fixed initial value when reached the maximum. This allows Lisp programs track notifications and remove them from the same frame from which they were created. (Fw32_notification_notify, Fw32_notification_close): Doc fixes. * doc/lispref/os.texi (Desktop Notifications): Update the documentation of 'w32-notification-notify' and 'w32-notification-close'. Bug#79400
* doc/emacs/display.texi (Semantic Font Lock): New node. * doc/emacs/emacs.texi: Update menu. * etc/NEWS: Update relevant entry. * lisp/emacs-lisp/elisp-scope.el: Expand commentary. * doc/misc/elisp-semantic-highlighting.org: Delete it.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler): Move bindings of `tramp-methods' and `tramp-gvfs-methods' up. (tramp-archive-file-name-handler): Do not use `tramp-archive-run-real-handler' for testing existence of `archive'. (Bug#79582) * test/lisp/net/tramp-archive-tests.el (tramp-archive-test-file-archive-hexlified): Move down. (tramp-archive-test-cascaded-file-archive) (tramp-archive-test-cascaded-archive, tramp-archive-test-cascaded): New defvars. (tramp-archive--test-deftest-cascaded): New defmacro. (tramp-archive-test01-file-name-syntax) (tramp-archive-test05-expand-file-name): Adapt tests. (tramp-archive-test01-file-name-syntax-cascaded) (tramp-archive-test05-expand-file-name-cascaded) (tramp-archive-test06-directory-file-name-cascaded) (tramp-archive-test07-file-exists-p-cascaded) (tramp-archive-test08-file-local-copy-cascaded) (tramp-archive-test09-insert-file-contents-cascaded) (tramp-archive-test11-copy-file-cascaded) (tramp-archive-test15-copy-directory-cascaded) (tramp-archive-test16-directory-files-cascaded) (tramp-archive-test17-insert-directory-cascaded) (tramp-archive-test18-file-attributes-cascaded) (tramp-archive-test19-directory-files-and-attributes-cascaded) (tramp-archive-test20-file-modes-cascaded) (tramp-archive-test21-file-links-cascaded) (tramp-archive-test26-file-name-completion-cascaded) (tramp-archive-test40-make-nearby-temp-file-cascaded) (tramp-archive-test43-file-system-info-cascaded) (tramp-archive-test44-user-group-ids-cascaded): New tests. * test/lisp/net/tramp-archive-resources/outer.zip: New test file.
* doc/misc/use-package.texi (Binding to a keymap): Discuss defvar-keymap ':prefix t' feature.
(hs-allow-nesting): Turn defvar into defcustom. (hs-indicator-hide): Use BLACK DOWN-POINTING SMALL TRIANGLE as a counterpart for the BLACK RIGHT-POINTING SMALL TRIANGLE.
* nt/emacs-x64.manifest: * nt/emacs-x86.manifest: supportedOS GUID for Windows 11 is the same as for Windows 10. See https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests#trustinfo
…g#79606) * lisp/frame.el (make-frame): On window-system frames apply buffer-local values for fringes, scroll bars and margins of root and minibuffer window after the new frame was made (Bug#79606).
* lisp/progmodes/elisp-mode.el (elisp-fontify-semantically): Fix typo in doc string. (elisp--annotate-symbol-with-help-echo): Accept plain string as value of ':help' symbol role property. * lisp/emacs-lisp/elisp-scope.el: Remove unused symbol role properties from all defined symbol roles. Use plain strings for ':help' instead of wrapping them with 'cl-constantly'. Cease 'require'ing 'cl-lib', no longer needed in runtime. (elisp-scope-define-symbol-role): Update doc string.
Rename a couple of faces to solidify the convention that the face name 'elisp-foo' implies "references to foo", not "foo definitions". For definitions we use 'elisp-deffoo' if foo is only one word, or 'elisp-bar-baz-definition' otherwise. * lisp/progmodes/elisp-mode.el (elisp-function-reference): Rename to 'elisp-function'. (elisp-macro-call): Rename to 'elisp-macro'. (elisp-non-local-exit): (elisp-unknown-call): (elisp-special-form): * lisp/emacs-lisp/elisp-scope.el: * test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el: Update references to renamed faces.
* lisp/net/tramp.el (tramp-make-tramp-file-name): Do not use the hop for the "archive" method.
* lisp/keymap.el (keymap-read-only-bind): Rename from `read-only-keymap-bind`. Improve docstring. (keymap--read-only-filter): Rename from `read-only-keymap-filter`. * lisp/net/goto-addr.el (goto-address-highlight-keymap): * lisp/progmodes/bug-reference.el (bug-reference-map): * lisp/net/browse-url.el (browse-url-button-map): * lisp/ansi-osc.el (ansi-osc-hyperlink-map): Adjust accordingly.
* lisp/arc-mode.el (archive-delete-local): Delete the directory recursively. (archive-squashfs-summarize): Make a local copy of a file if squashfs archive is included in another archive. (Bug#79582)
Use argument specs to analyze complex widget types. * lisp/emacs-lisp/elisp-scope.el (elisp-scope-widget-type) (elisp-scope-widget-type-1) (elisp-scope-widget-type-keyword-arguments) (elisp-scope-widget-type-arguments) (elisp-scope-widget-type-arguments-1): Delete, no longer used. (custom-declare-variable, define-widget): Simplify analyzers. (elisp-scope--match-spec-to-arg): Add new 'list', 'and', and 'plist-and-then' parametric specs, and add 'widget-type' as a new recursive spec. * test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el Add test.
* lisp/emacs-lisp/elisp-scope.el (elisp-scope-quoted-group): Delete it. (define-minor-mode, define-derived-mode): Simplify analyzers.
* lisp/progmodes/elisp-mode.el (elisp-free-variable) (elisp-bound-variable): Reset the foreground face (to avoid inheriting it from 'font-lock-variable-use-face') instead of hardcoding it to "black".
…620) Copyright-paperwork-exempt: yes
…ctions' * lisp/minibuffer.el (minibuffer-nonselected): Rewrite doc-string. (minibuffer--nonselected-overlay): Define it global. Rewrite doc-string. (minibuffer--nonselected-check): Rewrite by comparing the active minibuffer window with the selected window. (minibuffer--nonselected-setup): Globally add 'minibuffer--nonselected-check' to list of functions called by 'window-state-change-functions'. (minibuffer--nonselected-exit): Remove 'minibuffer--nonselected-check' from list of functions called by 'window-state-change-functions' when exiting last recursive minibuffer. (minibuffer-nonselected-mode): Globally add/remove 'minibuffer--nonselected-setup' to/from list of functions called by 'minibuffer-setup-hook' and 'minibuffer--nonselected-exit' to/from list of functions called by 'minibuffer-exit-hook' when activating/deactivating 'minibuffer-nonselected-mode'. Rewrite doc-string.
* lisp/progmodes/elisp-mode.el (elisp) (elisp-fontify-semantically, elisp-symbol-at-mouse) (elisp-free-variable, elisp-special-variable-declaration) (elisp-condition, elisp-major-mode-name, elisp-face) (elisp-symbol-role, elisp-symbol-role-definition) (elisp-function, elisp-non-local-exit, elisp-unknown-call) (elisp-macro, elisp-special-form, elisp-throw-tag) (elisp-feature, elisp-rx, elisp-theme, elisp-binding-variable) (elisp-bound-variable, elisp-shadowing-variable) (elisp-shadowed-variable, elisp-variable-at-point) (elisp-warning-type, elisp-function-property-declaration) (elisp-thing, elisp-slot, elisp-widget-type, elisp-type) (elisp-group, elisp-nnoo-backend, elisp-ampersand) (elisp-constant, elisp-defun, elisp-defmacro, elisp-defvar) (elisp-defface, elisp-icon, elisp-deficon, elisp-oclosure) (elisp-defoclosure, elisp-coding, elisp-defcoding) (elisp-charset, elisp-defcharset, elisp-completion-category) (elisp-completion-category-definition, elisp-add-help-echo) (elisp-fontify-symbol-precedence-function): Add :version tags. * lisp/emacs-lisp/elisp-scope.el: Fix references to meta-syntactic variables in the commentary. (elisp-scope-describe-symbol-role, coding, defcoding, charset) (defcharset): Doc fixes. (elisp-scope-safe-macros): Add :version tag. Doc fix. * doc/emacs/display.texi (Semantic Font Lock): Fix punctuation and wording, improve cross-references and indexing.
* lisp/progmodes/elisp-mode.el (elisp-unknown-call): Use a lighter foreground color on dark backgrounds for legibility.
For better compatibility with MS-Windows.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
35 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello!
The upstream repository
emacs-mirror/emacs@masterhas some new changes that aren't in this fork. So, here they are, ready to be merged! 🎉If this pull request can be merged without conflict, you can publish your software with these new changes. Otherwise, fix any merge conflicts by clicking the
Resolve Conflictsbutton.If you like Backstroke, consider donating to help us pay for infrastructure here. Backstroke is a completely open source project that's free to use, but we survive on sponsorships and donations. Thanks for your support! Help out Backstroke.
Created by Backstroke (I'm a bot!)