Merge from trunk

1 files changed, 21 insertions, 1 deletions

diff --git a/lisp/shell.el b/lisp/shell.el
index 2f11cc6314c..dde81c6cb95 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -459,7 +459,12 @@ buffer."
   ;; shell-dependent assignments.
   (when (ring-empty-p comint-input-ring)
     (let ((shell (file-name-nondirectory (car
-                   (process-command (get-buffer-process (current-buffer)))))))
+                   (process-command (get-buffer-process (current-buffer))))))
+          (hsize (getenv "HISTSIZE")))
+      (and (stringp hsize)
+           (integerp (setq hsize (string-to-number hsize)))
+           (> hsize 0)
+           (set (make-local-variable 'comint-input-ring-size) hsize))
       (setq comint-input-ring-file-name
             (or (getenv "HISTFILE")
                 (cond ((string-equal shell "bash") "~/.bash_history")
@@ -578,6 +583,21 @@ Otherwise, one argument `-i' is passed to the shell.
                    (get-buffer-create (or buffer "*shell*"))
                  ;; If the current buffer is a dead shell buffer, use it.
                  (current-buffer)))
+
+  ;; On remote hosts, the local `shell-file-name' might be useless.
+  (if (and (interactive-p)
+           (file-remote-p default-directory)
+           (null explicit-shell-file-name)
+           (null (getenv "ESHELL")))
+      (with-current-buffer buffer
+        (set (make-local-variable 'explicit-shell-file-name)
+             (file-remote-p
+              (expand-file-name
+               (read-file-name
+                "Remote shell path: " default-directory shell-file-name
+                t shell-file-name))
+              'localname))))
+
   ;; Pop to buffer, so that the buffer's window will be correctly set
   ;; when we call comint (so that comint sets the COLUMNS env var properly).
   (pop-to-buffer buffer)