From: Juanma Barranquero Date: Mon, 13 Nov 2006 10:24:55 +0000 (+0000) Subject: (set-visited-file-name): Use `format', not `message', in `y-or-n-p' call. X-Git-Tag: emacs-pretest-22.0.91~88 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=674b7bae631d3c256edb325a38454e5f8c36ce02;p=emacs.git (set-visited-file-name): Use `format', not `message', in `y-or-n-p' call. --- diff --git a/lisp/files.el b/lisp/files.el index 9228e547642..a84844810cb 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1533,7 +1533,7 @@ the various files." (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 @@ Do you want to save the file, and visit it normally instead? ") (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 @@ Do you want to discard your changes, and visit the file normally now? "))) 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 @@ the old visited file has been renamed to the new name FILENAME." (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