2 files changed, 6 insertions, 61 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cc42a5964b..f91313b5655 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,69 +1,14 @@
-2015-02-14  Artur Malabarba  <bruce.connor.am@gmail.com>
+2015-02-15  Jérémy Compostella  <jeremy.compostella@gmail.com>
 
-        * emacs-lisp/package.el (package-read-all-archive-contents): Don't
-        build the compatibility table.
-        (package-refresh-contents, package-initialize): Do build the
-        compatibility table.
-        (package--build-compatibility-table): New function.
-        (describe-package-1): Describe why a package is incompatible.
-
-2015-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children
-        of the parent.
-        (cl--assertion-failed): New function.
-        (cl-assertion-failed): Move in from cl-lib.el.
-
-        * emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register
-        as children of its parents.
-        (cl--make-type-test, cl--compiler-macro-typep): Remove functions.
-        (cl-typep): Reimplement using define-inline.
-        (cl-assert): Use cl--assertion-failed.
-        (cl-struct-slot-value): Use define-inline.
-
-        * emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload.
-
-        * textmodes/flyspell.el (flyspell-word): Defvar (bug#19844).
-        (flyspell-generic-check-word-p): Mark as obsolete.
-
-2015-02-13  Artur Malabarba  <bruce.connor.am@gmail.com>
-
-        * emacs-lisp/package.el (package--compatibility-table): New var.
-        (package--add-to-compatibility-table): New function.
-        (package-read-all-archive-contents): Populate compatibility table.
-        (package--incompatible-p): Also look in dependencies.
-        (describe-package-1): Fix "incompat" handling.
-
-2015-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
-
-        * net/rfc2104.el: Moved here from lisp/gnus.
-
-2015-02-13  Magnus Henoch  <magnus.henoch@gmail.com>
-
-        * net/sasl-scram-rfc.el: New file.
-
-        * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5.
-        Add SCRAM-SHA-1 first.
-        (sasl-mechanism-alist): Remove SCRAM-MD5 entry.  Add SCRAM-SHA-1
-        entry (bug#17636).
-
-2015-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
-
-        * net/shr.el (shr-tag-li): Speed up rendering pages with lots of
-        <ul>.
-
-2015-02-12  Oleh Krehel  <ohwoeowho@gmail.com>
-
-        * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom.
-        (gdb-inferior-filter): Don't pop up the buried output buffer when
-        `gdb-display-io-nopopup' is non-nil.
+        * net/tramp-sh.el (tramp-remote-process-environment): Disable paging
+        with PAGER=cat.  (Bug#19870)
 
 2015-02-12  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         python.el: Allow killing shell buffer if process is dead.  (Bug#19823)
 
-        * progmodes/python.el (python-shell-font-lock-kill-buffer):
-        Don't require a running process.
+        * progmodes/python.el (python-shell-font-lock-kill-buffer): Don't
+        require a running process.
         (python-shell-font-lock-post-command-hook): Fontify only if the
         shell process is running.
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 45050cdd77a..f3fdb63bb9e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -475,7 +475,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=" "PAGER=\"\""
+    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat"
     "autocorrect=" "correct=")
   "List of environment variables to be set on the remote host.