Mercurial > emacs
comparison lisp/ediff.el @ 73970:53a71b783884
(ediff-revision): Use `format', not `message', in `y-or-n-p' call.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 13 Nov 2006 10:23:44 +0000 |
parents | db25befb2938 |
children | e3694f1cb928 dbe3f29e61d6 |
comparison
equal
deleted
inserted
replaced
73969:5e2467f79e47 | 73970:53a71b783884 |
---|---|
1399 default-directory) | 1399 default-directory) |
1400 (ediff-get-default-file-name) | 1400 (ediff-get-default-file-name) |
1401 'no-dirs))) | 1401 'no-dirs))) |
1402 (find-file file) | 1402 (find-file file) |
1403 (if (and (buffer-modified-p) | 1403 (if (and (buffer-modified-p) |
1404 (y-or-n-p (message "Buffer %s is modified. Save buffer? " | 1404 (y-or-n-p (format "Buffer %s is modified. Save buffer? " |
1405 (buffer-name)))) | 1405 (buffer-name)))) |
1406 (save-buffer (current-buffer))) | 1406 (save-buffer (current-buffer))) |
1407 (let (rev1 rev2) | 1407 (let (rev1 rev2) |
1408 (setq rev1 | 1408 (setq rev1 |
1409 (read-string | 1409 (read-string |
1410 (format "Revision 1 to compare (default %s's latest revision): " | 1410 (format "Revision 1 to compare (default %s's latest revision): " |