(diff-apply-hunk): Use proper format string for

error.
This commit is contained in:
Andreas Schwab 2007-03-11 10:45:00 +00:00
parent c13ba385e9
commit 593b4fa884
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2007-03-11 Andreas Schwab <schwab@suse.de>
* diff-mode.el (diff-apply-hunk): Use proper format string for
error.
2007-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
* mail/emacsbug.el (report-emacs-bug): Don't hard code the "X" name.

View file

@ -1375,7 +1375,8 @@ With a prefix argument, REVERSE the hunk."
(yes-or-no-p (format "Really apply this hunk to %s? "
(file-name-nondirectory
buffer-file-name)))))))
(error (substitute-command-keys
(error "%s"
(substitute-command-keys
(format "Use %s\\[diff-apply-hunk] to apply it to the other file"
(if (not reverse) "\\[universal-argument] ")))))
((and switched