HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EasyPG: Rename epa-mail-minor-mode to epa-global-mail-mode.
[bpt/emacs.git]
/
lisp
/
userlock.el
diff --git
a/lisp/userlock.el
b/lisp/userlock.el
index
37ff1f1
..
ed9ccb1
100644
(file)
--- a/
lisp/userlock.el
+++ b/
lisp/userlock.el
@@
-1,7
+1,7
@@
;;; userlock.el --- handle file access contention between multiple users
;;; userlock.el --- handle file access contention between multiple users
-;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
-;; 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 200
1, 200
2, 2003, 2004,
+;; 2005
, 2006, 2007, 2008
Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal
@@
-10,7
+10,7
@@
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version
2
, or (at your option)
+;; the Free Software Foundation; either version
3
, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-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
(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 E
MACS
.
+already started modifying in E
macs
.
-You can <s>teal the file;
T
he other user becomes the
+You can <s>teal the file;
t
he 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.")
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.")
@@
-134,7
+134,7
@@
The buffer in question is current when this function is called."
(setq answer nil))
((eq answer 'revert)
(revert-buffer nil (not (buffer-modified-p)))
(setq answer nil))
((eq answer 'revert)
(revert-buffer nil (not (buffer-modified-p)))
- ; ask confirmation if
f
buffer modified
+ ; ask confirmation if buffer modified
(signal 'file-supersession
(list "File reverted" fn)))
((eq answer 'yield)
(signal 'file-supersession
(list "File reverted" fn)))
((eq answer 'yield)