# HG changeset patch # User Juanma Barranquero # Date 1163413495 0 # Node ID 4ef05dc6f45829b727586dc948f1ee75dba5f1ee # Parent 53a71b7838846087fa4facf8e1a7d2459c051a63 (set-visited-file-name): Use `format', not `message', in `y-or-n-p' call. diff -r 53a71b783884 -r 4ef05dc6f458 lisp/files.el --- a/lisp/files.el Mon Nov 13 10:23:44 2006 +0000 +++ b/lisp/files.el Mon Nov 13 10:24:55 2006 +0000 @@ -1533,7 +1533,7 @@ (not (eq major-mode 'hexl-mode))) (if (buffer-modified-p) (if (y-or-n-p - (format + (format (if rawfile "The file %s is already visited normally, and you have edited the buffer. Now you have asked to visit it literally, @@ -1553,7 +1553,7 @@ (find-file-noselect-1 buf filename nowarn rawfile truename number)) (if (y-or-n-p - (format + (format (if rawfile "\ Do you want to discard your changes, and visit the file literally now? " @@ -1563,8 +1563,8 @@ rawfile truename number) (error (if rawfile "File already visited non-literally" "File already visited literally")))) - (if (y-or-n-p - (format + (if (y-or-n-p + (format (if rawfile "The file %s is already visited normally. You have asked to visit it literally, @@ -2820,8 +2820,8 @@ (let ((buffer (and filename (find-buffer-visiting filename)))) (and buffer (not (eq buffer (current-buffer))) (not no-query) - (not (y-or-n-p (message "A buffer is visiting %s; proceed? " - filename))) + (not (y-or-n-p (format "A buffer is visiting %s; proceed? " + filename))) (error "Aborted"))) (or (equal filename buffer-file-name) (progn