commit 4204a9572a9fd84f92a1bcd78d1cfaaa9b8550ae (HEAD, refs/remotes/origin/master) Author: Juri Linkov Date: Tue Aug 19 09:48:29 2025 +0300 ; * lisp/vc/vc.el (vc--maybe-read-remote-location): Fix args of read-string. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 6f8985dc0c9..95b8a6f3a23 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3474,7 +3474,7 @@ The command prompts for the branch whose change log to show." (defun vc--maybe-read-remote-location () (and current-prefix-arg - (read-string "Remote location/branch (empty for default): " + (read-string "Remote location/branch (empty for default): " nil 'vc-remote-location-history))) (defun vc--incoming-revision (backend remote-location) commit 8747657dd8874e20ffa7021c638996de7442aecc Author: Philipp Stephani Date: Mon Aug 18 11:23:26 2025 +0200 Catch all non-local exits when running ERT tests. See discussion in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76447. * lisp/emacs-lisp/ert.el (ert--run-test-internal): Catch all non-local exits in 'handler-bind'. diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index cf21af8f101..1ebddf98fe4 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -813,7 +813,7 @@ This mainly sets up debugger-related bindings." (letrec ((debugfun (lambda (err) (ert--run-test-debugger test-execution-info err debugfun)))) - (handler-bind (((error quit) debugfun)) + (handler-bind ((t debugfun)) (funcall (ert-test-body (ert--test-execution-info-test test-execution-info)))))))) (ert-pass))