From f68e7a0a41188a7932544699ca23be7199ac3191 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 17 May 2026 09:05:13 +0300 Subject: [PATCH 01/13] ; Improve documentation of commands that move by compilation errors * lisp/simple.el (next-error): * lisp/progmodes/compile.el (compilation-next-error) (compilation-previous-error): Doc fixes. --- lisp/progmodes/compile.el | 17 ++++++++++++++--- lisp/simple.el | 5 ++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 5222579592e..aaad8622c95 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2821,13 +2821,23 @@ and runs `compilation-filter-hook'." (defun compilation-next-error (n &optional different-file pt) "Move point to the next error in the compilation buffer. -This function does NOT find the source line like \\[next-error]. +This function does NOT find the source line like \\[next-error], +but you can use \\[compilation-display-error] to find and +display the corresponding source code. Prefix arg N says how many error messages to move forwards (or backwards, if negative). +Where the current error ends and the next one begins is determined +by the rules from `compilation-error-regexp-alist' that matched +the compilation messages; this function moves point to where +the \\+`compilation-message' text property changes its value. +In general, all the messages that have the same line and column +numbers are considered parts of a single compilation message. + Optional arg DIFFERENT-FILE, if non-nil, means find next error for a file that is different from the current one. Optional arg PT, if non-nil, specifies the value of point to start -looking for the next message." +looking for the next message. +In interacvtive invocations, DIFFERENT-FILE and PT are always nil." (interactive "p") (or (compilation-buffer-p (current-buffer)) (error "Not in a compilation buffer")) @@ -2871,7 +2881,8 @@ looking for the next message." "Move point to the previous error in the compilation buffer. Prefix arg N says how many error messages to move backwards (or forwards, if negative). -Does NOT find the source line like \\[previous-error]." +Does NOT find the source line like \\[previous-error]. +This is like `compilation-next-error', but moves in the other direction." (interactive "p") (compilation-next-error (- n))) diff --git a/lisp/simple.el b/lisp/simple.el index 9346af5e8af..fd9ba28c762 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -362,7 +362,10 @@ until you use it in some other buffer that uses Compilation mode or Compilation Minor mode. To control which errors are matched, customize the variable -`compilation-error-regexp-alist'." +`compilation-error-regexp-alist'. The rules there determine the +boundaries between error messages. In general, messages that share +the same line and column numbers are considered parts of a single +error message." (interactive "P") (if (consp arg) (setq reset t arg nil)) (let ((buffer (next-error-find-buffer))) From 1832a93547bf71f94bdefba01e69e25836443348 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 17 May 2026 10:37:01 +0300 Subject: [PATCH 02/13] ; * src/fns.c (Fequal): Doc fix. --- src/fns.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fns.c b/src/fns.c index 1041938531c..1158f100ea0 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2804,7 +2804,8 @@ DEFUN ("equal", Fequal, Sequal, 2, 2, 0, doc: /* Return t if two Lisp objects have similar structure and contents. They must have the same data type. Conses are compared by comparing the cars and the cdrs. -Vectors and strings are compared element by element. +Vectors and strings are compared element by element (so text properties +of strings are ignored). Numbers are compared via `eql', so integers do not equal floats. \(Use `=' if you want integers and floats to be able to be equal.) Symbols must match exactly. */) From d89054627c4ead0b35c09e895884d4cfca926e24 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 17 May 2026 10:57:53 +0300 Subject: [PATCH 03/13] Fix updates of embedded formulas by 'calc-embedded-update-formula' * lisp/calc/calc-embed.el (calc-embedded-update): Use 'buffer-substring' to better track the string representation of the formula when it is being edited. Suggested by gnu@publik.slmail.me. Also, update commentary. (Bug#80901) --- lisp/calc/calc-embed.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index 7b3c5daaede..631efe9069b 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -103,7 +103,8 @@ ;; 3 Bottom of current formula (marker). ;; 4 Top of current formula's delimiters (marker). ;; 5 Bottom of current formula's delimiters (marker). -;; 6 String representation of current formula. +;; 6 String representation of current formula (actually, the +;; buffer-substring between positions given by 2 and 3 above. ;; 7 Non-nil if formula is embedded within a single line. ;; 8 Internal representation of current formula. ;; 9 Variable assigned by this formula, or nil. @@ -1140,7 +1141,8 @@ The command \\[yank] can retrieve it from there." (insert str) (set-marker (aref info 3) (+ (point) adjbot)) (set-marker (aref info 5) (+ (point) delta)) - (aset info 6 str)))))) + (aset info 6 (buffer-substring (aref info 2) + (aref info 3)))))))) (if (eq (car-safe val) 'calcFunc-evalto) (progn (setq evalled (nth 2 val) From b7825c3a271e72f46a4b9712ec78f8a49cb9503d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 17 May 2026 18:21:49 +0200 Subject: [PATCH 04/13] Fix auth-source-backends-parse * lisp/auth-source.el (auth-source-backend-parse): Drop backends of type `ignore'. (Bug#81024) (auth-source-backends): Drop duplicate backends. --- lisp/auth-source.el | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lisp/auth-source.el b/lisp/auth-source.el index bc660b2f4ab..f541dd3d141 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -361,9 +361,19 @@ soon as a function returns non-nil.") (defun auth-source-backend-parse (entry) "Create an `auth-source-backend' from an ENTRY in `auth-sources'." - (let ((backend - (run-hook-with-args-until-success 'auth-source-backend-parser-functions - entry))) + (let* ((auth-source-backend-parser-functions + ;; The functions shall drop backends of type `ignore', in + ;; order to let the hook continue. + (mapcar + (lambda (fun) + `(lambda (entry) + (and-let* ((result (funcall ',fun entry)) + ((not (eq (slot-value result 'type) 'ignore))) + result)))) + auth-source-backend-parser-functions)) + (backend + (run-hook-with-args-until-success + 'auth-source-backend-parser-functions entry))) (unless backend ;; none of the parsers worked @@ -378,12 +388,12 @@ soon as a function returns non-nil.") "List of usable backends from `auth-sources'. Filter out backends with type `ignore'. A fallback backend is added to ensure, that at least `read-passwd' is called." - `(or (seq-keep + `(or (seq-uniq (seq-keep (lambda (entry) (and-let* ((backend (auth-source-backend-parse entry)) ((not (eq (slot-value backend 'type) 'ignore))) backend))) - auth-sources) + auth-sources)) ;; Fallback. (list (auth-source-backend :source "" From 0977d5915d1918b0c9e3e37971b4e1b6484425ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sun, 17 May 2026 13:01:48 +0100 Subject: [PATCH 05/13] Eglot: add left-fringe code action indicator (bug#80326) The fringe indicator uses a custom lightning-bolt bitmap, an alternative to the margin indicator on GUI frames. It is non-interactive, however. * lisp/progmodes/eglot.el (eglot--fringe-action): New fringe bitmap. (eglot-code-action-indications): Add 'left-fringe' to default value and to docstring. Update incompatibility note. (eglot-code-action-suggestion): Handle 'left-fringe' indication. --- lisp/progmodes/eglot.el | 49 ++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 3d2c267650e..07d64d8209c 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -595,15 +595,16 @@ servers." :type 'boolean) (defface eglot-code-action-indicator-face - '((t (:inherit font-lock-escape-face :weight bold))) + '((t (:inherit warning :weight bold))) "Face used for code action suggestions.") (defcustom eglot-code-action-indications - '(eldoc-hint margin) + '(eldoc-hint left-fringe margin) "How Eglot indicates there's are code actions available at point. Value is a list of symbols, more than one can be specified: - `eldoc-hint': ElDoc is used to hint about at-point actions; +- `left-fringe': A special indicator appears on the left fringe; - `margin': A special indicator appears in the margin; - `nearby': A special indicator appears near point; - `mode-line': A special indicator appears in the mode-line. @@ -612,10 +613,13 @@ If the list is empty, Eglot will not hint about code actions at point. Note additionally: -- `margin' and `nearby' are incompatible. If both are specified, - the latter takes priority; -- `mode-line' only works if `eglot-mode-line-action-suggestion' exists in - `eglot-mode-line-format' (which see)." +- Some values are incompatible; if one or more of `nearby', + `left-fringe' and `margin' are specified, earlier values take + precedence. +- The indicators for many of these are customizable via + `eglot-code-action-indicator' (which see), except for `left-fringe'. +- `mode-line' only works if `eglot-mode-line-action-suggestion' exists + in `eglot-mode-line-format' (which see)." :type '(set :tag "Tick the ones you're interested in" (const :tag "ElDoc textual hint" eldoc-hint) @@ -4720,6 +4724,19 @@ at point. With prefix argument, prompt for ACTION-KIND." (eglot--code-action eglot-code-action-rewrite "refactor.rewrite") (eglot--code-action eglot-code-action-quickfix "quickfix") +(define-fringe-bitmap 'eglot--fringe-action + [#b00000111 + #b00001110 + #b00011100 + #b00111000 + #b01111111 + #b00001110 + #b01011100 + #b01111000 + #b01110000 + #b01111000] + nil nil 'center) + (defun eglot-code-action-suggestion (cb &rest _ignored) "A member of `eldoc-documentation-functions', for suggesting actions." (when (and (eglot-server-capable :codeActionProvider) @@ -4759,13 +4776,19 @@ at point. With prefix argument, prompt for ACTION-KIND." (overlay-put ov 'before-string - (cond ((memq 'nearby eglot-code-action-indications) - tooltip) - ((memq 'margin eglot-code-action-indications) - (propertize "⚡" - 'display - `((margin left-margin) - ,tooltip))))) + (cond + ((memq 'nearby eglot-code-action-indications) + tooltip) + ((and + (memq 'left-fringe eglot-code-action-indications) + (< 0 (nth 0 (window-fringes)))) + (propertize + "⚡" 'display `(left-fringe + eglot--fringe-action + eglot-code-action-indicator-face))) + ((memq 'margin eglot-code-action-indications) + (propertize + "⚡" 'display `((margin left-margin) ,tooltip))))) (setq eglot--suggestion-overlay ov)))) (when use-text-p (funcall cb blurb)))) :hint :textDocument/codeAction) From 36036e71c0c255fc80f38672ba639cc66b0c90ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sun, 17 May 2026 15:02:57 +0100 Subject: [PATCH 06/13] Jsonrpc: migrate more tests to Python subprocess fixtures All tests now use 'jsonrpc--with-python-fixture' with a Python3 subprocess instead of the in-Emacs TCP server. Changed the "harakiri" method to be a request instead of a notification for to reduce chance of "Sentinel hasn't run" warning. The two in-Emacs-RPC-specific error tests ('errors-with--32601' and 'signals-an--32603-JSONRPC-error') are dropped with the fixture itself, as the error paths they exercise are internal to the Emacs Lisp dispatcher and have no direct Python equivalent. They will have to be re-done later on in other form. * test/lisp/jsonrpc-resources/server-emacsrpc.py: New file. * test/lisp/jsonrpc-resources/server-anxious-nested.py: Use new harakiri. * test/lisp/jsonrpc-resources/server-emacsrpc.py: Use new harakiri. * test/lisp/jsonrpc-resources/server-harakiri.py: Use new harakiri. * test/lisp/jsonrpc-resources/server-remote-during-sync-1.py: Use new harakiri. * test/lisp/jsonrpc-resources/server-remote-during-sync-2.py: Use new harakiri. * test/lisp/jsonrpc-resources/server-remote-error.py: Use new harakiri. * test/lisp/jsonrpc-resources/common.py (harakiri): New definition. * test/lisp/jsonrpc-tests.el (jsonrpc--with-python-fixture): Rework, move up. (jsonrpc-connection-ready-p): Move up. (jsonrpc--call-with-emacsrpc-fixture) (jsonrpc--with-emacsrpc-fixture) (errors-with--32601) (signals-an--32603-JSONRPC-error): Remove. (returns-3, times-out, doesnt-time-out, stretching-it-but-works) (deferred-action-toolate, deferred-action-intime) (deferred-action-complex-tests): Migrate to Python fixture. (scontrol-remote-during-sync-1, scontrol-remote-during-sync-2) (scontrol-anxious-nested, scontrol-remote-error) (shutdown-clean-after-notification): Tweak. --- test/lisp/jsonrpc-resources/common.py | 9 + .../server-anxious-nested.py | 6 +- .../lisp/jsonrpc-resources/server-emacsrpc.py | 54 ++++ .../lisp/jsonrpc-resources/server-harakiri.py | 6 +- .../server-remote-during-sync-1.py | 6 +- .../server-remote-during-sync-2.py | 6 +- .../jsonrpc-resources/server-remote-error.py | 6 +- test/lisp/jsonrpc-tests.el | 270 ++++++------------ 8 files changed, 167 insertions(+), 196 deletions(-) create mode 100644 test/lisp/jsonrpc-resources/server-emacsrpc.py diff --git a/test/lisp/jsonrpc-resources/common.py b/test/lisp/jsonrpc-resources/common.py index 6bcc1db8bba..7b103aba0c3 100644 --- a/test/lisp/jsonrpc-resources/common.py +++ b/test/lisp/jsonrpc-resources/common.py @@ -30,3 +30,12 @@ def write_msg(msg): def log(text): """Write a log line to stderr.""" print(f'[test-server] {text}', file=sys.stderr, flush=True) + +def harakiri(msg): + """Maybe handle harakiri request/notif in msg.""" + if msg.get('method') == 'harakiri': + log('-> very clean harakiri') + if (mid := msg.get('id')) is not None: + write_msg({'jsonrpc': '2.0', 'id': mid, 'result': True}) + return True + return False diff --git a/test/lisp/jsonrpc-resources/server-anxious-nested.py b/test/lisp/jsonrpc-resources/server-anxious-nested.py index 8169b0936d1..970196e619c 100755 --- a/test/lisp/jsonrpc-resources/server-anxious-nested.py +++ b/test/lisp/jsonrpc-resources/server-anxious-nested.py @@ -15,7 +15,7 @@ import os import sys sys.path.insert(0, os.path.dirname(__file__)) -from common import read_msg, write_msg, log +from common import read_msg, write_msg, log, harakiri def main(): @@ -26,9 +26,7 @@ def main(): mid = lr1.get('id') method = lr1.get('method') log(f'<- {method or "(response)"} id={mid}') - if method == 'harakiri': - log('-> very clean harakiri') - break + if harakiri(lr1): break elif method == 'LR1': # Send RR1, then immediately respond to LR1 without awaiting # anything. The response-to-LR1 will be queued as anxious on the diff --git a/test/lisp/jsonrpc-resources/server-emacsrpc.py b/test/lisp/jsonrpc-resources/server-emacsrpc.py new file mode 100644 index 00000000000..22923f5b5f2 --- /dev/null +++ b/test/lisp/jsonrpc-resources/server-emacsrpc.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 +"""General-purpose JSONRPC server for jsonrpc.el tests. + +Handles arithmetic (+ - * /), sit-for, vconcat, append, and ignore, +mirroring the methods the in-process Emacs RPC server supports. +""" +import functools +import operator +import os +import sys +import time + +sys.path.insert(0, os.path.dirname(__file__)) +from common import log, read_msg, write_msg, harakiri + +HANDLERS = { + '+': lambda p: sum(p), + '-': lambda p: functools.reduce(operator.sub, p), + '*': lambda p: functools.reduce(operator.mul, p), + '/': lambda p: functools.reduce(operator.truediv, p), + 'vconcat': lambda p: sum(p, []), + 'append': lambda p: sum(p, []), + 'sit-for': lambda p: time.sleep(p[0]), + 'ignore': lambda _: None, +} + + +def main(): + while True: + msg = read_msg() + if msg is None: + break + mid = msg.get('id') + method = msg.get('method') + log(f'<- {method or "(response)"} id={mid}') + if harakiri(msg): break + if method is None or mid is None: + continue + handler = HANDLERS.get(method) + if handler is None: + write_msg({'jsonrpc': '2.0', 'id': mid, + 'error': {'code': -32601, 'message': 'Method not found'}}) + else: + try: + result = handler(msg.get('params', [])) + write_msg({'jsonrpc': '2.0', 'id': mid, 'result': result}) + log(f'-> (response {method}) id={mid}') + except Exception as exc: + write_msg({'jsonrpc': '2.0', 'id': mid, + 'error': {'code': -32603, 'message': str(exc)}}) + + +if __name__ == '__main__': + main() diff --git a/test/lisp/jsonrpc-resources/server-harakiri.py b/test/lisp/jsonrpc-resources/server-harakiri.py index c20a3fbdaee..ee7eae54073 100755 --- a/test/lisp/jsonrpc-resources/server-harakiri.py +++ b/test/lisp/jsonrpc-resources/server-harakiri.py @@ -5,7 +5,7 @@ """ import os, sys sys.path.insert(0, os.path.dirname(__file__)) -from common import read_msg, log +from common import read_msg, log, harakiri def main(): @@ -15,9 +15,7 @@ def main(): break method = msg.get('method') log(f'<- {method or "(response)"} id={msg.get("id")}') - if method == 'harakiri': - log('-> very clean harakiri') - break + if harakiri(msg): break if __name__ == '__main__': diff --git a/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py b/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py index b8cb549bbd5..d9d116e256e 100755 --- a/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py +++ b/test/lisp/jsonrpc-resources/server-remote-during-sync-1.py @@ -11,7 +11,7 @@ import os import sys sys.path.insert(0, os.path.dirname(__file__)) -from common import read_msg, write_msg, log +from common import read_msg, write_msg, log, harakiri def main(): @@ -22,9 +22,7 @@ def main(): mid = msg.get('id') method = msg.get('method') log(f'<- {method or "(response)"} id={mid}') - if method == 'harakiri': - log('-> very clean harakiri') - break + if harakiri(msg): break elif method == 'LR1': # Send RR1 request write_msg({'jsonrpc': '2.0', 'id': 1000, diff --git a/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py b/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py index e6250a0553b..77e9a3eb005 100755 --- a/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py +++ b/test/lisp/jsonrpc-resources/server-remote-during-sync-2.py @@ -11,7 +11,7 @@ import os import sys sys.path.insert(0, os.path.dirname(__file__)) -from common import read_msg, write_msg, log +from common import read_msg, write_msg, log, harakiri def main(): @@ -22,9 +22,7 @@ def main(): mid = msg.get('id') method = msg.get('method') log(f'<- {method or "(response)"} id={mid}') - if method == 'harakiri': - log('-> very clean harakiri') - break + if harakiri(msg): break elif method == 'LR1': # Send RR1 request write_msg({'jsonrpc': '2.0', 'id': 1000, diff --git a/test/lisp/jsonrpc-resources/server-remote-error.py b/test/lisp/jsonrpc-resources/server-remote-error.py index 00c907e189b..ea1dfdc7e96 100755 --- a/test/lisp/jsonrpc-resources/server-remote-error.py +++ b/test/lisp/jsonrpc-resources/server-remote-error.py @@ -13,7 +13,7 @@ """ import os, sys sys.path.insert(0, os.path.dirname(__file__)) -from common import read_msg, write_msg, log +from common import read_msg, write_msg, log, harakiri def main(): @@ -24,9 +24,7 @@ def main(): mid = msg.get('id') method = msg.get('method') log(f'<- {method or "(response)"} id={mid}') - if method == 'harakiri': - log('-> very clean harakiri') - break + if harakiri(msg): break elif method == 'LR1': # Send badMethod BEFORE responding to LR1; the client # rdispatcher will signal a jsonrpc-error for it. diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el index cdb4e04fc39..ec85210c091 100644 --- a/test/lisp/jsonrpc-tests.el +++ b/test/lisp/jsonrpc-tests.el @@ -41,121 +41,55 @@ (defclass jsonrpc--test-client (jsonrpc--test-endpoint) ((hold-deferred :initform t :accessor jsonrpc--hold-deferred))) -(defun jsonrpc--call-with-emacsrpc-fixture (fn) - "Do work for `jsonrpc--with-emacsrpc-fixture'. Call FN." - (let* (listen-server endpoint) - (unwind-protect - (progn - (setq listen-server - (make-network-process - :name "Emacs RPC server" :server t :host "localhost" - :service (if (version<= emacs-version "26.1") - 44444 - ;; 26.1 can automatically find ports if - ;; one passes 0 here. - 0) - :log (lambda (listen-server client _message) - (push - (make-instance - 'jsonrpc--test-endpoint - :name (process-name client) - :process client - :request-dispatcher - (lambda (_endpoint method params) - (unless (memq method '(+ - * / vconcat append - sit-for ignore)) - (signal 'jsonrpc-error - '((jsonrpc-error-message - . "Sorry, this isn't allowed") - (jsonrpc-error-code . -32601)))) - (apply method (append params nil))) - :on-shutdown - (lambda (conn) - (setf (jsonrpc--shutdown-complete-p conn) t))) - (process-get listen-server 'handlers))))) - (setq endpoint - (make-instance - 'jsonrpc--test-client - :process - (open-network-stream "JSONRPC test tcp endpoint" - nil "localhost" - (process-contact listen-server - :service)) - :on-shutdown - (lambda (conn) - (setf (jsonrpc--shutdown-complete-p conn) t)))) - (funcall fn endpoint)) - (unwind-protect - (when endpoint - (kill-buffer (jsonrpc--events-buffer endpoint)) - (jsonrpc-shutdown endpoint)) - (when listen-server - (cl-loop do (delete-process listen-server) - while (progn (accept-process-output nil 0.1) - (process-live-p listen-server)) - do (jsonrpc--message - "test listen-server is still running, waiting")) - (cl-loop for handler in (process-get listen-server 'handlers) - do (ignore-errors (jsonrpc-shutdown handler))) - (mapc #'kill-buffer - (mapcar #'jsonrpc--events-buffer - (process-get listen-server 'handlers)))))))) -(cl-defmacro jsonrpc--with-emacsrpc-fixture ((endpoint-sym) &body body) +;;; Tests using Python subprocesses +;;; + +(defconst jsonrpc--test-dir + (file-name-directory (or load-file-name buffer-file-name)) + "Directory of this test file, captured at load time.") + +(cl-defmacro jsonrpc--with-python-fixture ((script conn &rest initargs) &body body) + "Start SCRIPT under python3 as a pipe subprocess, bind connection to CONN. +SCRIPT is a path relative to this file's directory. +INITARGS are passed to `make-instance' for `jsonrpc--test-client'." (declare (indent 1)) - `(jsonrpc--call-with-emacsrpc-fixture (lambda (,endpoint-sym) ,@body))) - -(ert-deftest returns-3 () - "A basic test for adding two numbers in our test RPC." - (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) - (should (= 3 (jsonrpc-request conn '+ [1 2]))))) - -(ert-deftest errors-with--32601 () - "Errors with -32601" - (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) - (condition-case err - (progn - (jsonrpc-request conn 'delete-directory "~/tmp") - (ert-fail "A `jsonrpc-error' should have been signaled!")) - (jsonrpc-error - (should (= -32601 (cdr (assoc 'jsonrpc-error-code (cdr err))))))))) - -(ert-deftest signals-an--32603-JSONRPC-error () - "Signals an -32603 JSONRPC error." - (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) - (condition-case err - (let ((jsonrpc-inhibit-debug-on-error t)) - (jsonrpc-request conn '+ ["a" 2]) - (ert-fail "A `jsonrpc-error' should have been signaled!")) - (jsonrpc-error - (should (= -32603 (cdr (assoc 'jsonrpc-error-code (cdr err))))))))) - -(ert-deftest times-out () - "Request for 3-sec sit-for with 1-sec timeout times out." - (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) - (should-error - (jsonrpc-request conn 'sit-for [3] :timeout 1)))) - -(ert-deftest doesnt-time-out () - :tags '(:expensive-test) - "Request for 1-sec sit-for with 2-sec timeout succeeds." - (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) - (jsonrpc-request conn 'sit-for [1] :timeout 2))) - -(ert-deftest stretching-it-but-works () - "Vector of numbers or vector of vector of numbers are serialized." - (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) - ;; (vconcat [1 2 3] [3 4 5]) => [1 2 3 3 4 5] which can be - ;; serialized. - (should (equal - [1 2 3 3 4 5] - (jsonrpc-request conn 'vconcat [[1 2 3] [3 4 5]]))))) + `(let ((,conn nil)) + (skip-unless (executable-find "python3")) + (unwind-protect + (progn + (setq ,conn + (make-instance + 'jsonrpc--test-client + :name "jsonrpc-python-test" + :process (make-process + :name "jsonrpc-python-test" + :command (list "python3" + (expand-file-name + ,script + jsonrpc--test-dir)) + :connection-type 'pipe + :noquery t) + ,@initargs)) + (with-timeout (5 + (when ,conn + (let ((buf (jsonrpc--events-buffer ,conn))) + (when (buffer-live-p buf) + (if noninteractive + (progn + (message "contents of `%s':" (buffer-name buf)) + (princ (with-current-buffer buf (buffer-string)) + #'external-debugging-output)) + (message "Preserved for inspection: %s" + (buffer-name buf)))))) + (ert-fail "Test timed out after 5s")) + ,@body)) + (when ,conn + (ignore-errors + (jsonrpc-request ,conn 'harakiri nil :timeout 1) + (accept-process-output nil 0.1) + (kill-buffer (jsonrpc--events-buffer ,conn)) + (jsonrpc-shutdown ,conn)))))) (cl-defmethod jsonrpc-connection-ready-p ((conn jsonrpc--test-client) what) @@ -163,11 +97,46 @@ (or (not (string-match "deferred" what)) (not (jsonrpc--hold-deferred conn))))) +(ert-deftest returns-3 () + "A basic test for adding two numbers in our test RPC." + (skip-when (eq system-type 'windows-nt)) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) + (should (= 3 (jsonrpc-request conn '+ [1 2]))))) + +(ert-deftest times-out () + "Request for 3-sec sit-for with 1-sec timeout times out." + (skip-when (eq system-type 'windows-nt)) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) + (should-error + (jsonrpc-request conn 'sit-for [3] :timeout 1)))) + +(ert-deftest doesnt-time-out () + :tags '(:expensive-test) + "Request for 1-sec sit-for with 2-sec timeout succeeds." + (skip-when (eq system-type 'windows-nt)) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) + (jsonrpc-request conn 'sit-for [1] :timeout 2))) + +(ert-deftest stretching-it-but-works () + "Vector of numbers or vector of vector of numbers are serialized." + (skip-when (eq system-type 'windows-nt)) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) + ;; (vconcat [1 2 3] [3 4 5]) => [1 2 3 3 4 5] which can be + ;; serialized. + (should (equal + [1 2 3 3 4 5] + (jsonrpc-request conn 'vconcat [[1 2 3] [3 4 5]]))))) + (ert-deftest deferred-action-toolate () :tags '(:expensive-test) "Deferred request fails because no one clears the flag." (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) (should-error (jsonrpc-request conn '+ [1 2] :deferred "deferred-testing" :timeout 0.5) @@ -182,7 +151,8 @@ (skip-when (eq system-type 'windows-nt)) ;; Send an async request, which returns immediately. However the ;; success fun which sets the flag only runs after some time. - (jsonrpc--with-emacsrpc-fixture (conn) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) (jsonrpc-async-request conn 'sit-for [0.5] :success-fn @@ -199,7 +169,8 @@ :tags '(:expensive-test) "Test a more complex situation with deferred requests." (skip-when (eq system-type 'windows-nt)) - (jsonrpc--with-emacsrpc-fixture (conn) + (jsonrpc--with-python-fixture + ("jsonrpc-resources/server-emacsrpc.py" conn) (let (n-deferred-1 n-deferred-2 second-deferred-went-through-p) @@ -252,60 +223,11 @@ (should (eq 2 n-deferred-2)) (should (eq 0 (hash-table-count (jsonrpc--deferred-actions conn))))))) - -;;; Tests using Python subprocesses (scontrol / anxious mechanism) -;;; - -(defconst jsonrpc--test-dir - (file-name-directory (or load-file-name buffer-file-name)) - "Directory of this test file, captured at load time.") - -(cl-defmacro jsonrpc--with-python-fixture ((script conn &rest initargs) &body body) - "Start SCRIPT under python3 as a pipe subprocess, bind connection to CONN. -SCRIPT is a path relative to this file's directory. -INITARGS are passed to `make-instance' for `jsonrpc-process-connection'." - (declare (indent 1)) - `(let ((,conn nil)) - (unwind-protect - (progn - (setq ,conn - (make-instance - 'jsonrpc-process-connection - :name "jsonrpc-python-test" - :process (make-process - :name "jsonrpc-python-test" - :command (list "python3" - (expand-file-name - ,script - jsonrpc--test-dir)) - :connection-type 'pipe - :noquery t) - ,@initargs)) - (with-timeout (5 - (when ,conn - (let ((buf (jsonrpc--events-buffer ,conn))) - (when (buffer-live-p buf) - (if noninteractive - (progn - (message "contents of `%s':" (buffer-name buf)) - (princ (with-current-buffer buf (buffer-string)) - #'external-debugging-output)) - (message "Preserved for inspection: %s" - (buffer-name buf)))))) - (ert-fail "Test timed out after 5s")) - ,@body)) - (when ,conn - (ignore-errors - (jsonrpc-notify ,conn 'harakiri nil) - (kill-buffer (jsonrpc--events-buffer ,conn)) - (jsonrpc-shutdown ,conn)))))) - (ert-deftest scontrol-remote-during-sync-1 () "Anxious local continuations. Endpoint sends a remote request RR1 on LR1, then replies to LR1 immediately before waiting for RR1 to resolve. This is what JETLS does (bug#80623)." - (skip-unless (executable-find "python3")) (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-python-fixture ("jsonrpc-resources/server-remote-during-sync-1.py" conn @@ -322,7 +244,6 @@ Exactly the same test as 2, but different endpoint, which now still sends RR1 on LR1 but now waits for RR1 to resolve before replying to LR1. This is what GoPls does (bug#80623)." - (skip-unless (executable-find "python3")) (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-python-fixture ("jsonrpc-resources/server-remote-during-sync-2.py" conn @@ -337,7 +258,6 @@ This is what GoPls does (bug#80623)." "Nested anxious continuations Two local sync requests LR1 and LR2 with a remote RR1 in between. Vaguely similar to Julia's JETLS (bug#80623), but more complex." - (skip-unless (executable-find "python3")) (skip-when (eq system-type 'windows-nt)) (let (lr2-result completed) (jsonrpc--with-python-fixture @@ -349,7 +269,8 @@ Vaguely similar to Julia's JETLS (bug#80623), but more complex." (setq lr2-result (jsonrpc-request conn 'LR2 [] :timeout 5)) (push "lr2" completed) - (push "rr1" completed)) + (push "rr1" completed) + "rr1-ok") (_ (error "unexpected method: %s" method))))) (should (equal "lr1-ok" (jsonrpc-request conn 'LR1 [] :timeout 5))) (push "lr1" completed) @@ -358,7 +279,6 @@ Vaguely similar to Julia's JETLS (bug#80623), but more complex." (ert-deftest scontrol-remote-error () "Anxious continuation even when rdispatcher signals errors." - (skip-unless (executable-find "python3")) (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-python-fixture ("jsonrpc-resources/server-remote-error.py" conn @@ -372,10 +292,9 @@ Vaguely similar to Julia's JETLS (bug#80623), but more complex." (_ (error "unexpected method: %s" method))))) (should (equal "ok" (jsonrpc-request conn 'LR1 [] :timeout 5))))) -(ert-deftest shutdown-clean-after-notification () - "Server exits cleanly after harakiri notification. +(ert-deftest shutdown-clean-after-request () + "Server exits cleanly after harakiri request. `jsonrpc-shutdown' should not emit a \"Sentinel hasn't run\" warning." - (skip-unless (executable-find "python3")) (skip-when (eq system-type 'windows-nt)) (let (warned) (cl-letf (((symbol-function 'jsonrpc--warn) @@ -383,10 +302,9 @@ Vaguely similar to Julia's JETLS (bug#80623), but more complex." (setq warned (apply #'format fmt args))))) (jsonrpc--with-python-fixture ("jsonrpc-resources/server-harakiri.py" conn) - (jsonrpc-notify conn 'harakiri nil) - ;; Give the server time to exit before shutdown checks the sentinel. - (accept-process-output nil 0.3) - (jsonrpc-shutdown conn))) + (jsonrpc-request conn 'harakiri nil :timeout 3) + (jsonrpc-shutdown conn) + (setq conn nil))) (should-not warned))) (provide 'jsonrpc-tests) From 6c1829bf4c5acd3e676b0cb802a096d36fdd33bc Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 17 May 2026 19:22:39 +0100 Subject: [PATCH 07/13] Eglot: fix thinko in recent markdown-related commit (bug#81063) * lisp/progmodes/eglot.el (eglot--format-markup): Correct return value for gfm-view-mode. --- lisp/progmodes/eglot.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 07d64d8209c..02fc4615acf 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -2255,12 +2255,13 @@ If MODE, force MODE to be used for fontifying MARKUP." for to = (or (next-single-property-change from 'invisible) (point-max)) when inv - do (put-text-property from to 'invisible t))) + do (put-text-property from to 'invisible t) + finally return (buffer-string))) (calc2 (forced-mode) (cond (forced-mode `(,forced-mode)) (built-in `(,#'markdown-ts-view-mode)) - ((fboundp 'gfm-view-mode) `(,#'gfm-view-mode #'gfm-extract)) + ((fboundp 'gfm-view-mode) `(,#'gfm-view-mode ,#'gfm-extract)) (t `(#'text-mode)))) (calc (s &optional (forced-mode mode) &aux (x (calc2 forced-mode))) (setq string s render (car x) extract (or (cadr x) #'buffer-string)))) From 1d7d6ffedbcefaf691777d81f40846ba62ffdee5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 18 May 2026 16:36:05 +0300 Subject: [PATCH 08/13] ; * etc/PROBLEMS: Fix entries about display of Emoji on TTY (bug#81052). --- etc/PROBLEMS | 72 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 2ae82292e04..b619c6e7f37 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2649,6 +2649,45 @@ all such characters will look the same on display, and the only way of knowing what is the real codepoint in the buffer is to go to the character and type "C-u C-x =". +*** Display problems with Emoji on text terminals + +Some text-mode terminals cause problems with Emoji sequences: when +displaying them, the Emacs text-mode frame could show gaps, misalignment +between the display and cursor motion, and other visual artifacts and +display problems. + +This can happen if the terminal and Emacs differ in their notions of how +many columns (a.k.a. "character cells") a given sequence of characters +takes on the screen when displayed. As one example, Emoji sequences +that begin with a non-Emoji character and end in U+FE0F VARIATION +SELECTOR 16 are composed on display into an Emoji glyph, but the width +of this glyph is up to the terminal and the font it uses to show the +Emoji. If the non-Emoji character that begins the sequence has the +width 1, Emacs will think that its composition with VS-16 also takes 1 +column on the screen, because VS-16 has width of zero. But some +terminals which support Emoji sequences will show a double-width Emoji +glyph in this case, without any way for Emacs to know that. This causes +cursor addressing to get out of sync and eventually messes up the +display. In particular, Kitty, Alacritty, Ghostty, and some other +terminal emulators are known to behave like that. + +Similar problems can happen with composition of characters other than +Emoji. + +The solution is to disable 'auto-composition-mode' on these +terminals, for example, like this: + + (setq auto-composition-mode "alacritty") + +This disables 'auto-composition-mode' on frames that display on +terminals of the named type. More generally, customizing the +'auto-composition-mode' variable to have as value a string that the +'tty-type' function returns on a terminal will disable compositions in +windows shown on terminals of that type. (You can also disable +'auto-composition-mode' globally, if all your frames are on terminals +that have this problem, by setting 'auto-composition-mode' to the nil +value.) + *** Messed-up display on the Kitty text terminal This terminal has its own peculiar ideas about display of unusual @@ -2674,33 +2713,6 @@ Another workaround is to set 'nobreak-char-ascii-display' to a non-nil value, which will cause any non-ASCII space and hyphen characters to be displayed as their ASCII counterparts, with a special face. -Kitty also differs from many other character terminals in how it -handles character compositions. As one example, Emoji sequences that -begin with a non-Emoji character and end in U+FE0F VARIATION SELECTOR -16 should be composed into an Emoji glyph; Kitty assumes that all such -Emoji glyphs have 2-column width, whereas Emacs and many other text -terminals display them as 1-column glyphs. Again, this causes cursor -addressing to get out of sync and eventually messes up the display. - -One possible workaround for problems caused by character composition -is to turn off 'auto-composition-mode' on Kitty terminals, e.g. by -customizing the 'auto-composition-mode' variable to have as value a -string that the 'tty-type' function returns on those terminals. - -*** Display artifacts on the Alacritty text terminal - -This terminal is known to cause problems with Emoji sequences: when -displaying them, the Emacs text-mode frame could show gaps and other -visual artifacts. - -The solution is to disable 'auto-composition-mode' on these -terminals, for example, like this: - - (setq auto-composition-mode "alacritty") - -This disables 'auto-composition-mode' on frames that display on -terminals of this type. - ** Screen readers get confused about character position The Emacs display code sometimes emits TAB characters purely for motion @@ -2713,6 +2725,12 @@ This can confuse screen reader software under certain terminal emulators in the terminal before starting Emacs may mitigate this. See also the discussion in Bug#78474 . +Starting from version 31.1, Emacs by default no longer outputs series of +TAB characters followed by BACKSPACE, which used to confuse some of the +screen readers. If you encounter some problems in this area, verify +that the variable 'tty-cursor-movement-use-TAB-BS' is set to its default +nil value. + * Runtime problems specific to individual Unix variants ** GNU/Linux From eb90c528f38af557f0cfe927463c01c02f1b13e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 18 May 2026 16:27:35 +0100 Subject: [PATCH 09/13] ; * lisp/progmodes/eglot.el (eglot-code-action-indications): Tweak. --- lisp/progmodes/eglot.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 02fc4615acf..f00a3a265c5 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -625,6 +625,7 @@ Note additionally: (const :tag "ElDoc textual hint" eldoc-hint) (const :tag "Right besides point" nearby) (const :tag "In mode line" mode-line) + (const :tag "In left fringe" left-fringe) (const :tag "In margin" margin)) :package-version '(Eglot . "1.19")) From 6bd73af24136b70baa932fbe5c187edd97154b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 18 May 2026 17:09:19 +0100 Subject: [PATCH 10/13] ; * test/lisp/jsonrpc-tests.el: Adjust timeouts for CI EMBA testing --- test/lisp/jsonrpc-tests.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el index ec85210c091..28f7740ab32 100644 --- a/test/lisp/jsonrpc-tests.el +++ b/test/lisp/jsonrpc-tests.el @@ -177,25 +177,26 @@ INITARGS are passed to `make-instance' for `jsonrpc--test-client'." ;; This returns immediately (jsonrpc-async-request conn - 'sit-for [0.1] + 'sit-for [0.01] :success-fn (lambda (_result) ;; this only gets runs after the "first deferred" is stashed. (setq n-deferred-1 (hash-table-count (jsonrpc--deferred-actions conn))))) (should-error - ;; This stashes the request and waits. It will error because - ;; no-one clears the "hold deferred" flag. + ;; This stashes the request and waits. It will error with a + ;; timeout after blocking for 1 sec because no-one clears the + ;; "hold deferred" flag. (jsonrpc-request conn 'ignore ["first deferred"] :deferred "first deferred" - :timeout 0.5) + :timeout 1.0) :type 'jsonrpc-error) ;; The error means the deferred actions stash is now empty (should (zerop (hash-table-count (jsonrpc--deferred-actions conn)))) ;; Again, this returns immediately. (jsonrpc-async-request conn - 'sit-for [0.1] + 'sit-for [0.01] :success-fn (lambda (_result) ;; This gets run while "third deferred" below is waiting for From 10e91e096d8bb07ac12d960a5bc6b473e30bb812 Mon Sep 17 00:00:00 2001 From: Joshua Murphy Date: Sat, 16 May 2026 13:35:23 -0400 Subject: [PATCH 11/13] Get selected item in newsticker list view * lisp/net/newst-treeview.el (newsticker--treeview-get-selected-item): If an item is already selected, use it. (Bug#80972) Copyright-paperwork-exempt: yes --- lisp/net/newst-treeview.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 04d796b0b90..8b5f8a8528f 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -1387,8 +1387,10 @@ Will move to previous feed until an item is found." (defun newsticker--treeview-get-selected-item () "Return item that is currently selected in list buffer." (with-current-buffer (newsticker--treeview-list-buffer) - (beginning-of-line) - (get-text-property (point) :nt-item))) + (goto-char (point-min)) + (if-let* ((selected (text-property-search-forward :nt-selected t t))) + (get-text-property (prop-match-beginning selected) :nt-item) + (get-text-property (point-min) :nt-item)))) (defun newsticker-treeview-mark-item-old (&optional dont-proceed) "Mark current item as old unless it is obsolete. From 389874c533bbd2a5594ce490510ad25bca147899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Mon, 18 May 2026 20:33:44 +0100 Subject: [PATCH 12/13] Eglot: unbreak for treesit-less builds * lisp/progmodes/eglot.el (eglot--builtin-mdown-p): New helper. (eglot--accepted-formats) (eglot--format-markup): Use it. --- lisp/progmodes/eglot.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index f00a3a265c5..e55928556f9 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -726,11 +726,15 @@ This can be useful when using docker to run a language server.") (executable-find command))) (declare-function treesit-grammar-location "treesit.c") + +(defun eglot--builtin-mdown-p () + (and (fboundp 'markdown-ts-view-mode) + (fboundp 'treesit-grammar-location) + (treesit-grammar-location 'markdown))) + (defun eglot--accepted-formats () (if (and (not eglot-prefer-plaintext) - (or (fboundp 'gfm-view-mode) - (and (fboundp 'markdown-ts-view-mode) - (treesit-grammar-location 'markdown)))) + (or (fboundp 'gfm-view-mode) (eglot--builtin-mdown-p))) ["markdown" "plaintext"] ["plaintext"])) @@ -2237,9 +2241,7 @@ Doubles as an indicator of snippet support." (cl-defun eglot--format-markup (markup &optional mode - &aux string lang render extract - (built-in (and (fboundp 'markdown-ts-view-mode) - (treesit-grammar-location 'markdown)))) + &aux string lang render extract) "Format MARKUP according to LSP's spec. MARKUP is either an LSP MarkedString or MarkupContent object. If MODE, force MODE to be used for fontifying MARKUP." @@ -2261,7 +2263,7 @@ If MODE, force MODE to be used for fontifying MARKUP." (calc2 (forced-mode) (cond (forced-mode `(,forced-mode)) - (built-in `(,#'markdown-ts-view-mode)) + ((eglot--builtin-mdown-p) `(,#'markdown-ts-view-mode)) ((fboundp 'gfm-view-mode) `(,#'gfm-view-mode ,#'gfm-extract)) (t `(#'text-mode)))) (calc (s &optional (forced-mode mode) &aux (x (calc2 forced-mode))) From 28a13b01c7d7ccfd50e02cb34f5d119b28173df9 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 18 May 2026 22:15:29 +0100 Subject: [PATCH 13/13] vc-refresh-state: Override default-directory for backend functions I ran into the issue described in the comment with the current code in project-find-file-in and project-find-dir, when using 'C-x p p' to switch between projects. * lisp/vc/vc-hooks.el (vc-refresh-state): When calling into the backend, override any let-bindings of default-directory. --- lisp/vc/vc-hooks.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index d0f292d2c9d..64ad4d5daec 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -955,10 +955,16 @@ In the latter case, VC mode is deactivated for this buffer." (cond ((setq backend (with-demoted-errors "VC refresh error: %S" (vc-backend buffer-file-name))) - ;; Let the backend setup any buffer-local things he needs. - (vc-call-backend backend 'find-file-hook) - ;; Compute the state and put it in the mode line. - (vc-mode-line buffer-file-name backend) + ;; When `auto-revert-handler' calls us then `default-directory' + ;; may be let-bound to something else for the purpose of some + ;; command that's currently doing some minibuffer prompting. + ;; Backend find-file-hook and mode-line-string functions should + ;; not need to be written so as to handle that possibility. + (let ((default-directory (buffer-local-toplevel-value 'default-directory))) + ;; Let the backend setup any buffer-local things it needs. + (vc-call-backend backend 'find-file-hook) + ;; Compute the state and put it in the mode line. + (vc-mode-line buffer-file-name backend)) (unless vc-make-backup-files ;; Use this variable, not make-backup-files, ;; because this is for things that depend on the file name.