master 43f2c8f9699: emacs-lock-mode: user-error instead of error

Eli Zaretskii <[email protected]> Sat, 4 Jul 2026 03:41:52 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
branch: master
commit 43f2c8f9699d7171c516c9335c9a52f0eddd5e47
Author: Lin Sun <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    emacs-lock-mode: user-error instead of error
    
    * lisp/emacs-lock.el (emacs-lock--kill-emacs-hook): Use 'user-error'
    instead of signaling an error.  (Bug#81292)
---
 lisp/emacs-lock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index c28b9d7bd52..0bc1678979f 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -146,7 +146,7 @@ Used from `kill-emacs-hook' (which see)."
   (let ((locked (emacs-lock--exit-locked-buffer)))
     (when locked
       (run-hook-with-args 'emacs-lock-locked-buffer-functions locked)
-      (error "Emacs cannot exit because buffer %S is locked"
+      (user-error "Emacs cannot exit because buffer %S is locked"
              (buffer-name locked)))))
 
 (defun emacs-lock--kill-emacs-query-functions ()