summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/userlock.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 8a539daace8..3be854b5aa6 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -87,9 +87,9 @@ in any way you like."
(defun ask-user-about-lock-help ()
(with-output-to-temp-buffer "*Help*"
(princ "It has been detected that you want to modify a file that someone else has
-already started modifying in EMACS.
+already started modifying in Emacs.
-You can <s>teal the file; The other user becomes the
+You can <s>teal the file; the other user becomes the
intruder if (s)he ever unmodifies the file and then changes it again.
You can <p>roceed; you edit at your own (and the other user's) risk.
You can <q>uit; don't modify this file.")