aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/userlock.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 316a1a4c892..ca4f216c0ac 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -76,7 +76,10 @@ already started modifying in EMACS.
76You can <s>teal the file; The other user becomes the 76You can <s>teal the file; The other user becomes the
77 intruder if (s)he ever unmodifies the file and then changes it again. 77 intruder if (s)he ever unmodifies the file and then changes it again.
78You can <p>roceed; you edit at your own (and the other user's) risk. 78You can <p>roceed; you edit at your own (and the other user's) risk.
79You can <q>uit; don't modify this file."))) 79You can <q>uit; don't modify this file.")
80 (save-excursion
81 (set-buffer standard-output)
82 (help-mode))))
80 83
81(put 84(put
82 'file-supersession 'error-conditions '(file-supersession file-error error)) 85 'file-supersession 'error-conditions '(file-supersession file-error error))
@@ -129,6 +132,9 @@ you risk ruining the work of whoever rewrote the file.
129If you say `n', the change you started to make will be aborted. 132If you say `n', the change you started to make will be aborted.
130 133
131Usually, you should type `n' and then `M-x revert-buffer', 134Usually, you should type `n' and then `M-x revert-buffer',
132to get the latest version of the file, then make the change again."))) 135to get the latest version of the file, then make the change again.")
136 (save-excursion
137 (set-buffer standard-output)
138 (help-mode))))
133 139
134;;; userlock.el ends here 140;;; userlock.el ends here