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

error.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c572fa206378f786d8c62f055f52ece2cdedeb8..5a3d490756b08edac1e8ef55418ff619d97ef126 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index ccd945db98e316714754f9307d63291f22d10e24..543e1bd6a399d9aabd7471804192e22da208bdde 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -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