mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows

Browse Source 
* lisp/vc/vc-annotate.el (vc-annotate): Force DOS EOL decoding on
MS-Windows and MS-DOS, when processing the output of "svn annotate".
This commit is contained in:
Eli Zaretskii 2016-03-31 23:01:13 +03:00
parent df441b362c
commit e30c3e9a9c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/vc/vc-annotate.el
View File

@ -432,6 +432,14 @@ should be applied to the background or to the foreground."
(with-output-to-temp-buffer temp-buffer-name
(let ((backend (or vc-bk (vc-backend file)))
(coding-system-for-read buffer-file-coding-system))
;; On DOS/Windows, "svn annotate" will produce CRLF EOLs even
;; if the original file has Unix EOLs, which will show ^M
;; characters in the Annotate buffer. Prevent that by forcing
;; DOS EOL decoding.
(if (memq system-type '(windows-nt ms-dos))
(setq coding-system-for-read
(coding-system-change-eol-conversion coding-system-for-read
'dos)))
(vc-call-backend backend 'annotate-command file
(get-buffer temp-buffer-name) rev)
;; we must setup the mode first, and then set our local