diff options
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 26bba40b4b4..bf5bb5cd5da 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -2097,7 +2097,7 @@ ARG is a prefix argument. If nil, copy the current difference region." (if this-buf-n-th-diff-saved (if (yes-or-no-p - (format + (format-message "You've previously copied diff region %d to buffer %S. Confirm? " (1+ n) buf-type)) t @@ -2858,13 +2858,14 @@ Hit \\[ediff-recenter] to reset the windows afterward." (B-line (ediff-with-current-buffer ediff-buffer-B (1+ (count-lines (point-min) (point))))) C-line) - (princ (format "\Buffer A's point is on line %d\n" A-line)) - (princ (format "Buffer B's point is on line %d\n" B-line)) + (princ (format-message "Buffer A's point is on line %d\n" A-line)) + (princ (format-message "Buffer B's point is on line %d\n" B-line)) (if ediff-3way-job (progn (setq C-line (ediff-with-current-buffer ediff-buffer-C (1+ (count-lines (point-min) (point))))) - (princ (format "Buffer C's point is on line %d\n" C-line))))) + (princ (format-message + "Buffer C's point is on line %d\n" C-line))))) (princ (format "\nCurrent difference number = %S\n" (cond ((< ediff-current-difference 0) 'start) @@ -2890,7 +2891,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." (princ "\nIgnoring regions that match") (princ - (format + (format-message "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" ediff-regexp-hide-A ediff-hide-regexp-connective ediff-regexp-hide-B))) @@ -2899,15 +2900,16 @@ Hit \\[ediff-recenter] to reset the windows afterward." (princ "\nFocusing on regions that match") (princ - (format + (format-message "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" ediff-regexp-focus-A ediff-focus-regexp-connective ediff-regexp-focus-B))) (t (princ "\nSelective browsing via a user-defined method.\n"))) (princ - (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel." - (substitute-command-keys "\\[ediff-submit-report]"))) + (format-message + "\nBugs/suggestions: type `%s' while in Ediff Control Panel." + (substitute-command-keys "\\[ediff-submit-report]"))) ) ; with output (if (frame-live-p ediff-control-frame) (ediff-reset-mouse ediff-control-frame)) |