diff options
| -rw-r--r-- | lisp/vc/vc-annotate.el | 9 |
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 |