Commit 0e2c793f authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix ugly ^M characters in Diff output shown by "C-x v u".

 lisp/vc/vc.el (vc-diff-internal): Use *-dos coding-system when
 reading output from Diff on MS-Windows and MS-DOS.
parent 447bdcb8
2013-11-26 Eli Zaretskii <eliz@gnu.org>
* vc/vc.el (vc-diff-internal): Use *-dos coding-system when
reading output from Diff on MS-Windows and MS-DOS.
2013-11-26 Bozhidar Batsov <bozhidar@batsov.com>
* emacs-lisp/helpers.el (string-reverse): New function.
......
......@@ -1641,6 +1641,13 @@ Return t if the buffer had changes, nil otherwise."
;; be to call the back end separately for each file.
(coding-system-for-read
(if files (vc-coding-system-for-diff (car files)) 'undecided)))
;; On MS-Windows and MS-DOS, Diff is likely to produce DOS-style
;; EOLs, which will look ugly if (car files) happens to have Unix
;; EOLs.
(if (memq system-type '(windows-nt ms-dos))
(setq coding-system-for-read
(coding-system-change-eol-conversion coding-system-for-read
'dos)))
(vc-setup-buffer buffer)
(message "%s" (car messages))
;; Many backends don't handle well the case of a file that has been
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment