aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/userlock.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/userlock.el')
-rw-r--r--lisp/userlock.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 4ad96eb41ce..9409409a608 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -30,8 +30,7 @@
30 30
31;;; Code: 31;;; Code:
32 32
33(put 'file-locked 'error-conditions '(file-locked file-error error)) 33(define-error 'file-locked "File is locked" 'file-error)
34(put 'file-locked 'error-message "File is locked")
35 34
36;;;###autoload 35;;;###autoload
37(defun ask-user-about-lock (file opponent) 36(defun ask-user-about-lock (file opponent)
@@ -94,8 +93,7 @@ You can <q>uit; don't modify this file.")
94 (with-current-buffer standard-output 93 (with-current-buffer standard-output
95 (help-mode)))) 94 (help-mode))))
96 95
97(put 96(define-error 'file-supersession nil 'file-error)
98 'file-supersession 'error-conditions '(file-supersession file-error error))
99 97
100;;;###autoload 98;;;###autoload
101(defun ask-user-about-supersession-threat (fn) 99(defun ask-user-about-supersession-threat (fn)