# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1173609881 0
# Node ID 5e29de959ce6454025718c78945c8ed878b017de
# Parent  fd659a939db932dbf7aa824f6124142ebe2b3678
(diff-apply-hunk): Use proper format string for
error.

diff -r fd659a939db9 -r 5e29de959ce6 lisp/diff-mode.el
--- a/lisp/diff-mode.el	Sun Mar 11 06:19:48 2007 +0000
+++ b/lisp/diff-mode.el	Sun Mar 11 10:44:41 2007 +0000
@@ -1375,7 +1375,8 @@
                        (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