--- a/lisp/files.el	Mon Aug 13 10:20:29 2007 +0200
+++ b/lisp/files.el	Mon Aug 13 10:21:18 2007 +0200
@@ -1128,8 +1128,9 @@
 			    (file-newer-than-file-p (make-auto-save-file-name)
 						    buffer-file-name))
 		       (format "%s has auto save data; consider M-x recover-file"
+			       (file-name-nondirectory buffer-file-name))
 		     (setq not-serious t)
-		     (if error (gettext "(New file)") nil))))
+		     (if error (gettext "(New file)") nil)))
 		  ((not error)
 		   (setq not-serious t)
 		   (gettext "Note: file is write protected"))
@@ -1155,7 +1156,7 @@
 		   nil))))
       (if msg
 	  (progn
-	    (message msg)
+	    (message "%s" msg)
 	    (or not-serious (sit-for 1 t)))))
     (if (and auto-save-default (not noauto))
 	(auto-save-mode t)))