(Fwrite_region): Don't change START and END from nil

[gnu-emacs] / lisp / userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 23430fa1e0495686a29cab41e2441533f2baff8f..316a1a4c892312ed0038d4d78e1c9acf38ef3a66 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -2,11 +2,14 @@
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, inc.
 
+;; Maintainer: FSF
+;; Keywords: internal
+
 ;; This file is part of GNU Emacs.
 
 ;; 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 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,12 +21,14 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
 
-;; This file is autloaded to handle certain conditions
+;; This file is autoloaded to handle certain conditions
 ;; detected by the file-locking code within Emacs.
 ;; The two entry points are `ask-user-about-lock' and
 ;; `ask-user-about-supersession-threat'.
 
+;;; Code:
 
 (put 'file-locked 'error-conditions '(file-locked file-error error))
 
@@ -89,7 +94,8 @@ 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 or C-h) "
+                (file-name-nondirectory fn))
        (let ((tem (downcase (let ((cursor-in-echo-area t))
                               (read-char)))))
          (setq answer