Merge changes from emacs-23 branch.

1 files changed, 16 insertions, 1 deletions

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 434c2a10e14..20e56bbd42f 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1437,6 +1437,16 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
 ;;          (vc-call-backend ',(vc-backend f)
 ;;                           'diff (list ',f) ',rev1 ',rev2))))))
 
+(defvar vc-coding-system-inherit-eol t
+  "When non-nil, inherit the EOL format for reading Diff output from the file.
+
+Used in `vc-coding-system-for-diff' to determine the EOL format to use
+for reading Diff output for a file.  If non-nil, the EOL format is
+inherited from the file itself.
+Set this variable to nil if your Diff tool might use a different
+EOL.  Then Emacs will auto-detect the EOL format in Diff output, which
+gives better results.") ;; Cf. bug#4451.
+
 (defun vc-coding-system-for-diff (file)
   "Return the coding system for reading diff output for FILE."
   (or coding-system-for-read
@@ -1444,7 +1454,12 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
       ;; use the buffer's coding system
       (let ((buf (find-buffer-visiting file)))
         (when buf (with-current-buffer buf
-                    buffer-file-coding-system)))
+                    (if vc-coding-system-inherit-eol
+                        buffer-file-coding-system
+                      ;; Don't inherit the EOL part of the coding-system,
+                      ;; because some Diff tools may choose to use
+                      ;; a different one.  bug#4451.
+                      (coding-system-base buffer-file-coding-system)))))
       ;; otherwise, try to find one based on the file name
       (car (find-operation-coding-system 'insert-file-contents file))
       ;; and a final fallback