aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorMichael Albinus2012-03-01 10:01:08 +0100
committerMichael Albinus2012-03-01 10:01:08 +0100
commit99a54f2128e116ef58542fe745b3383f53dcf280 (patch)
tree3b2b21308f2777b04f05333db83c45f4a9a36fff /lisp/vc
parenta032a70212f82e2d7d1e8ca056508a16f4fd5c3e (diff)
downloademacs-99a54f2128e116ef58542fe745b3383f53dcf280.tar.gz
emacs-99a54f2128e116ef58542fe745b3383f53dcf280.zip
* net/tramp-sh.el (tramp-remote-process-environment): Add "PAGER=\"\"".
Reported by Robert Lupton the Good <rhl@astro.princeton.edu>. * vc/vc-git.el (vc-git--call): Enable `inhibit-null-byte-detection'. Add "PAGER=" to `process-environment'.
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc-git.el7
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
1108(defun vc-git--call (buffer command &rest args) 1108(defun vc-git--call (buffer command &rest args)
1109 ;; We don't need to care the arguments. If there is a file name, it 1109 ;; We don't need to care the arguments. If there is a file name, it
1110 ;; is always a relative one. This works also for remote 1110 ;; is always a relative one. This works also for remote
1111 ;; directories. 1111 ;; directories. We enable `inhibit-null-byte-detection', otherwise
1112 (apply 'process-file vc-git-program nil buffer nil command args)) 1112 ;; Tramp's eol conversion might be confused.
1113 (let ((inhibit-null-byte-detection t)
1114 (process-environment (cons "PAGER=" process-environment)))
1115 (apply 'process-file vc-git-program nil buffer nil command args)))
1113 1116
1114(defun vc-git--out-ok (command &rest args) 1117(defun vc-git--out-ok (command &rest args)
1115 (zerop (apply 'vc-git--call '(t nil) command args))) 1118 (zerop (apply 'vc-git--call '(t nil) command args)))