Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-530

[bpt/emacs.git] / lisp / userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 3b3d1fb..37ff1f1 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,6 +1,7 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
-;; Copyright (C) 1985, 1986 Free Software Foundation, inc.
+;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -19,8 +20,8 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -115,7 +116,7 @@ The buffer in question is current when this function is called."
        (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
@@ -160,4 +161,5 @@ to get the latest version of the file, then make the change again.")
       (set-buffer standard-output)
       (help-mode))))
 
+;;; arch-tag: a61c5b60-e1c8-44fd-894a-c617f4dfc639
 ;;; userlock.el ends here