From: Dmitry Gutov Date: Sat, 5 Sep 2015 12:44:47 +0000 (+0300) Subject: Use --strip-trailing-cr X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/8d313db758db8484a7ab487aa9a92b654f204344 Use --strip-trailing-cr #50 --- diff --git a/diff-hl-flydiff.el b/diff-hl-flydiff.el index 02169ccca..b89401d97 100644 --- a/diff-hl-flydiff.el +++ b/diff-hl-flydiff.el @@ -122,7 +122,7 @@ This requires the external program `diff' to be in your `exec-path'." temporary-file-directory)) (rev (diff-hl-flydiff-create-revision file (diff-hl-flydiff/working-revision file)))) - (diff-no-select rev (current-buffer) "-U 0" 'noasync + (diff-no-select rev (current-buffer) "-U 0 --strip-trailing-cr" 'noasync (get-buffer-create " *diff-hl-diff*"))))) (defun diff-hl-flydiff/update (old-fun &optional auto)