diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a320976a74f..08f6ac4d075 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,12 @@ * files.el (file-equal-p): Fix docstring. Avoid unnecessary access of FILE2, if FILE1 does not exist. + * 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'. + 2012-03-01 Michael R. Mauger <mmaug@yahoo.com> * progmodes/sql.el: Bug fix diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 801ec5f5fc9..1c23a6f20f3 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -543,7 +543,7 @@ as given in your `~/.profile'." ,(format "TERM=%s" tramp-terminal-type) "EMACS=t" ;; Deprecated. ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version) - "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" + "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" "autocorrect=" "correct=") "*List of environment variables to be set on the remote host. 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))) |