aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-04-01 23:22:52 +0300
committerEli Zaretskii2016-04-01 23:22:52 +0300
commit2d02a5f729c804e841fee5df5b2ae2a06b705bd3 (patch)
treeb896e1ce0d86f9152fb547f939a4d0d0fb6f3589
parent9151f16e8131e6fcd94aa9c8a1b10d9b08656b64 (diff)
downloademacs-2d02a5f729c804e841fee5df5b2ae2a06b705bd3.tar.gz
emacs-2d02a5f729c804e841fee5df5b2ae2a06b705bd3.zip
; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.
-rw-r--r--lisp/vc/vc-annotate.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 379ac95517b..774453f8b54 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -432,10 +432,11 @@ should be applied to the background or to the foreground."
432 (with-output-to-temp-buffer temp-buffer-name 432 (with-output-to-temp-buffer temp-buffer-name
433 (let ((backend (or vc-bk (vc-backend file))) 433 (let ((backend (or vc-bk (vc-backend file)))
434 (coding-system-for-read buffer-file-coding-system)) 434 (coding-system-for-read buffer-file-coding-system))
435 ;; On DOS/Windows, "svn annotate" will produce CRLF EOLs even 435 ;; For a VC backend running on DOS/Windows, it's normal to
436 ;; if the original file has Unix EOLs, which will show ^M 436 ;; produce CRLF EOLs even if the original file has Unix EOLs,
437 ;; characters in the Annotate buffer. Prevent that by forcing 437 ;; which will show ^M characters in the Annotate buffer. (One
438 ;; DOS EOL decoding. 438 ;; known case in point is "svn annotate".) Prevent that by
439 ;; forcing DOS EOL decoding.
439 (if (memq system-type '(windows-nt ms-dos)) 440 (if (memq system-type '(windows-nt ms-dos))
440 (setq coding-system-for-read 441 (setq coding-system-for-read
441 (coding-system-change-eol-conversion coding-system-for-read 442 (coding-system-change-eol-conversion coding-system-for-read