X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6251ee24afa4f74a3e094ba12493ab2dc9315886..f875b154b4dbaf7901c6bff923581197c1cf8ab5:/lisp/userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 16e8ebac47..8a539daace 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,11 +1,11 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
+;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
+
 ;; Maintainer: FSF
-;; Last-Modified: 26 May 1987
 ;; Keywords: internal
 
-;; Copyright (C) 1985, 1986 Free Software Foundation, inc.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -19,8 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -32,21 +33,35 @@
 ;;; Code:
 
 (put 'file-locked 'error-conditions '(file-locked file-error error))
+(put 'file-locked 'error-message "File is locked")
 
 ;;;###autoload
-(defun ask-user-about-lock (fn opponent)
-  "Ask user what to do when he wants to edit FILE but it is locked by USER.
+(defun ask-user-about-lock (file opponent)
+  "Ask user what to do when he wants to edit FILE but it is locked by OPPONENT.
 This function has a choice of three things to do:
-  do (signal 'buffer-file-locked (list FILE USER))
+  do (signal 'file-locked (list FILE OPPONENT))
     to refrain from editing the file
   return t (grab the lock on the file)
   return nil (edit the file even though it is locked).
-You can rewrite it to use any criterion you like to choose which one to do."
+You can redefine this function to choose among those three alternatives
+in any way you like."
   (discard-input)
   (save-window-excursion
-    (let (answer)
+    (let (answer short-opponent short-file)
+      (setq short-file
+	    (if (> (length file) 22)
+		(concat "..." (substring file (- (length file) 22)))
+	      file))
+      (setq short-opponent
+	    (if (> (length opponent) 25)
+		(save-match-data
+		  (string-match " (pid [0-9]+)" opponent)
+		  (concat (substring opponent 0 13) "..."
+			  (match-string 0 opponent)))
+	      opponent))
       (while (null answer)
-	(message "%s is locking %s: action (s, q, p, ?)? " opponent fn)
+	(message "%s locked by %s: (s, q, p, ?)? "
+		 short-file short-opponent)
 	(let ((tem (let ((inhibit-quit t)
 			 (cursor-in-echo-area t))
 		     (prog1 (downcase (read-char))
@@ -66,7 +81,7 @@ You can rewrite it to use any criterion you like to choose which one to do."
 		   (ask-user-about-lock-help)
 		   (setq answer nil))
 		  ((eq (cdr answer) 'yield)
-		   (signal 'file-locked (list "File is locked" fn opponent)))))))
+		   (signal 'file-locked (list file opponent)))))))
       (cdr answer))))
 
 (defun ask-user-about-lock-help ()
@@ -77,7 +92,10 @@ already started modifying in EMACS.
 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.")))
+You can <q>uit; don't modify this file.")
+    (save-excursion
+      (set-buffer standard-output)
+      (help-mode))))
 
 (put
  'file-supersession 'error-conditions '(file-supersession file-error error))
@@ -95,23 +113,30 @@ The buffer in question is current when this function is called."
   (save-window-excursion
     (let (answer)
       (while (null answer)
-	(message "File has changed on disk; really want to edit the buffer? (y, n or C-h) ")
+	(message "%s changed on disk; really edit the buffer? (y, n, r or C-h) "
+		 (file-name-nondirectory fn))
 	(let ((tem (downcase (let ((cursor-in-echo-area t))
-			       (read-char)))))
+			       (read-char-exclusive)))))
 	  (setq answer
 		(if (= tem help-char)
 		    'help
 		  (cdr (assoc tem '((?n . yield)
 				    (?\C-g . yield)
 				    (?y . proceed)
+				    (?r . revert)
 				    (?? . help))))))
 	  (cond ((null answer)
 		 (beep)
-		 (message "Please type y or n; or ? for help")
+		 (message "Please type y, n or r; or ? for help")
 		 (sit-for 3))
 		((eq answer 'help)
 		 (ask-user-about-supersession-help)
 		 (setq answer nil))
+		((eq answer 'revert)
+		 (revert-buffer nil (not (buffer-modified-p)))
+					; ask confirmation iff buffer modified
+		 (signal 'file-supersession
+			 (list "File reverted" fn)))
 		((eq answer 'yield)
 		 (signal 'file-supersession
 			 (list "File changed on disk" fn))))))
@@ -126,9 +151,15 @@ since you last read it in or saved it with this buffer.
 
 If you say `y' to go ahead and modify this buffer,
 you risk ruining the work of whoever rewrote the file.
+If you say `r' to revert, the contents of the buffer are refreshed
+from the file on disk.
 If you say `n', the change you started to make will be aborted.
 
 Usually, you should type `n' and then `M-x revert-buffer',
-to get the latest version of the file, then make the change again.")))
+to get the latest version of the file, then make the change again.")
+    (save-excursion
+      (set-buffer standard-output)
+      (help-mode))))
 
+;;; arch-tag: a61c5b60-e1c8-44fd-894a-c617f4dfc639
 ;;; userlock.el ends here