Mercurial > emacs
comparison lisp/diff-mode.el @ 76453:5e29de959ce6
(diff-apply-hunk): Use proper format string for
error.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 11 Mar 2007 10:44:41 +0000 |
| parents | 0aef0bcf12f7 |
| children | 3a37aeee9537 8c2ef9d5d4a8 |
comparison
equal
deleted
inserted
replaced
| 76452:fd659a939db9 | 76453:5e29de959ce6 |
|---|---|
| 1373 (not diff-apply-hunk-to-backup-file) | 1373 (not diff-apply-hunk-to-backup-file) |
| 1374 (not (set (make-local-variable 'diff-apply-hunk-to-backup-file) | 1374 (not (set (make-local-variable 'diff-apply-hunk-to-backup-file) |
| 1375 (yes-or-no-p (format "Really apply this hunk to %s? " | 1375 (yes-or-no-p (format "Really apply this hunk to %s? " |
| 1376 (file-name-nondirectory | 1376 (file-name-nondirectory |
| 1377 buffer-file-name))))))) | 1377 buffer-file-name))))))) |
| 1378 (error (substitute-command-keys | 1378 (error "%s" |
| 1379 (substitute-command-keys | |
| 1379 (format "Use %s\\[diff-apply-hunk] to apply it to the other file" | 1380 (format "Use %s\\[diff-apply-hunk] to apply it to the other file" |
| 1380 (if (not reverse) "\\[universal-argument] "))))) | 1381 (if (not reverse) "\\[universal-argument] "))))) |
| 1381 ((and switched | 1382 ((and switched |
| 1382 ;; A reversed patch was detected, perhaps apply it in reverse. | 1383 ;; A reversed patch was detected, perhaps apply it in reverse. |
| 1383 (not (save-window-excursion | 1384 (not (save-window-excursion |