[Emacs-diffs] /srv/bzr/emacs/trunk r107473: * net/tramp-sh.el (tramp-remote-process-environment): Add "PAGER=\"\"".

[Michael Albinus]

------------------------------------------------------------
revno: 107473
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2012-03-01 10:01:08 +0100
message:
  * net/tramp-sh.el (tramp-remote-process-environment): Add "PAGER=\"\"".
  Reported by Robert Lupton the Good <address@hidden>.
  
  * vc/vc-git.el (vc-git--call): Enable `inhibit-null-byte-detection'.
  Add "PAGER=" to `process-environment'.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el
  lisp/vc/vc-git.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-01 08:33:50 +0000
+++ b/lisp/ChangeLog    2012-03-01 09:01:08 +0000
@@ -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 <address@hidden>.
+
+       * vc/vc-git.el (vc-git--call): Enable `inhibit-null-byte-detection'.
+       Add "PAGER=" to `process-environment'.
+
 2012-03-01  Michael R. Mauger  <address@hidden>
 
        * progmodes/sql.el: Bug fix

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-02-25 08:51:32 +0000
+++ b/lisp/net/tramp-sh.el      2012-03-01 09:01:08 +0000
@@ -543,7 +543,7 @@
     ,(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.

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2012-02-25 04:29:09 +0000
+++ b/lisp/vc/vc-git.el 2012-03-01 09:01:08 +0000
@@ -1108,8 +1108,11 @@
 (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)))