# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 801730449 0
# Node ID 405d4e50022365a04c58b87900f47e7405ec2dce
# Parent  30b88291babf6f2b333eda0f7c7f2a8d61cabb84
(find-file-noselect): In "file changed" messages,
mention buffer name if different from file name.

diff -r 30b88291babf -r 405d4e500223 lisp/files.el
--- a/lisp/files.el	Mon May 29 06:36:12 1995 +0000
+++ b/lisp/files.el	Mon May 29 06:54:09 1995 +0000
@@ -685,11 +685,19 @@
 	      (cond ((not (file-exists-p filename))
 		     (error "File %s no longer exists!" filename))
 		    ((yes-or-no-p
-		      (format
-		       (if (buffer-modified-p buf)
-    "File %s changed on disk.  Discard your edits? "
-    "File %s changed on disk.  Reread from disk? ")
-		       (file-name-nondirectory filename)))
+		      (if (string= (file-name-nondirectory filename)
+				   (buffer-name buf))
+			  (format
+			   (if (buffer-modified-p buf)
+	"File %s changed on disk.  Discard your edits? "
+	"File %s changed on disk.  Reread from disk? ")
+			   (file-name-nondirectory filename))
+			(format
+			 (if (buffer-modified-p buf)
+      "File %s changed on disk.  Discard your edits in %s? "
+      "File %s changed on disk.  Reread from disk into %s? ")
+			 (file-name-nondirectory filename)
+			 (buffer-name buf))))
 		     (save-excursion
 		       (set-buffer buf)
 		       (revert-buffer t t)))))