diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 18:29:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 18:29:30 -0800 |
| commit | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (patch) | |
| tree | de238c6f707915be9ed1f10235589b4e975a08fb /lisp/vc/vc-git.el | |
| parent | a89654f8f34114db543cb91363e8fded6d73e986 (diff) | |
| parent | eec1549a6b89359b6d970f14dead275e59b7bc6f (diff) | |
| download | emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index dbe591a3ed8..3ec32243796 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1108,8 +1108,11 @@ The difference to vc-do-command is that this function always invokes (defun vc-git--call (buffer command &rest args) ;; We don't need to care the arguments. If there is a file name, it ;; is always a relative one. This works also for remote - ;; directories. - (apply 'process-file vc-git-program nil buffer nil command args)) + ;; directories. We enable `inhibit-null-byte-detection', otherwise + ;; Tramp's eol conversion might be confused. + (let ((inhibit-null-byte-detection t) + (process-environment (cons "PAGER=" process-environment))) + (apply 'process-file vc-git-program nil buffer nil command args))) (defun vc-git--out-ok (command &rest args) (zerop (apply 'vc-git--call '(t nil) command args))) |