From 593b4fa884f5be1124f95adba8c1e12c2a7930b9 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 11 Mar 2007 10:45:00 +0000 Subject: [PATCH] (diff-apply-hunk): Use proper format string for error. --- lisp/ChangeLog | 5 +++++ lisp/diff-mode.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c572fa2063..5a3d490756b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-03-11 Andreas Schwab + + * diff-mode.el (diff-apply-hunk): Use proper format string for + error. + 2007-03-11 Stefan Monnier * 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 ccd945db98e..543e1bd6a39 100644 --- 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 -- 2.39.5