aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-sh.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef145390a24..6373df64e91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-02-15 Jérémy Compostella <jeremy.compostella@gmail.com>
2
3 * net/tramp-sh.el (tramp-remote-process-environment): Disable paging
4 with PAGER=cat. (Bug#19870)
5
12015-02-13 Glenn Morris <rgm@gnu.org> 62015-02-13 Glenn Morris <rgm@gnu.org>
2 7
3 * textmodes/flyspell.el (flyspell-duplicate-distance): 8 * textmodes/flyspell.el (flyspell-duplicate-distance):
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8e65686e353..bd7aec98f79 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -457,7 +457,7 @@ as given in your `~/.profile'."
457 ,(format "TERM=%s" tramp-terminal-type) 457 ,(format "TERM=%s" tramp-terminal-type)
458 "EMACS=t" ;; Deprecated. 458 "EMACS=t" ;; Deprecated.
459 ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version) 459 ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
460 "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" 460 "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat"
461 "autocorrect=" "correct=") 461 "autocorrect=" "correct=")
462 "List of environment variables to be set on the remote host. 462 "List of environment variables to be set on the remote host.
463 463