procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.

Browse source
This commit is contained in:
Eli Zaretskii 2016-04-01 23:22:52 +03:00
parent 9151f16e81
commit 2d02a5f729
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc/vc-annotate.el
View file

@ -432,10 +432,11 @@ should be applied to the background or to the foreground."
(with-output-to-temp-buffer temp-buffer-name (with-output-to-temp-buffer temp-buffer-name
(let ((backend (or vc-bk (vc-backend file))) (let ((backend (or vc-bk (vc-backend file)))
(coding-system-for-read buffer-file-coding-system)) (coding-system-for-read buffer-file-coding-system))
;; On DOS/Windows, "svn annotate" will produce CRLF EOLs even ;; For a VC backend running on DOS/Windows, it's normal to
;; if the original file has Unix EOLs, which will show ^M ;; produce CRLF EOLs even if the original file has Unix EOLs,
;; characters in the Annotate buffer. Prevent that by forcing ;; which will show ^M characters in the Annotate buffer. (One
;; DOS EOL decoding. ;; known case in point is "svn annotate".) Prevent that by
;; forcing DOS EOL decoding.
(if (memq system-type '(windows-nt ms-dos)) (if (memq system-type '(windows-nt ms-dos))
(setq coding-system-for-read (setq coding-system-for-read
(coding-system-change-eol-conversion coding-system-for-read (coding-system-change-eol-conversion coding-system-for-read