diff options
Diffstat (limited to 'lisp/vc/ediff-diff.el')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index fde9d4338f3..0965e888f06 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -87,7 +87,7 @@ options after the default ones. This variable is not for customizing the look of the differences produced by the command \\[ediff-show-diff-output]. Use the variable `ediff-custom-diff-options' for that." - :set 'ediff-set-diff-options + :set #'ediff-set-diff-options :type 'string) (ediff-defvar-local ediff-ignore-case nil @@ -231,10 +231,7 @@ one optional arguments, diff-number to refine.") (sit-for 2) ;; 1 is an error exit code 1) - (t (message "Computing differences between %s and %s ..." - (file-name-nondirectory file1) - (file-name-nondirectory file2)) - ;; this erases the diff buffer automatically + (t ;; this erases the diff buffer automatically (ediff-exec-process ediff-diff-program diff-buffer 'synchronize @@ -1146,7 +1143,10 @@ are ignored." (if (string-match "buffer" (symbol-name ediff-job-name)) ediff-coding-system-for-write ediff-coding-system-for-read)) - args) + (process-environment + ;; Avoid localization of messages so we can parse the output. + (cons "LC_MESSAGES=C" process-environment)) + args) (setq args (append (split-string options) (mapcar (lambda (file) (when (stringp file) |