* files.el (cd-absolute): Set `list-buffers-directory' in order to

show correct path in buffer list.

* net/tramp.el (tramp-open-connection-setup-interactive-shell)
(tramp-find-shell): Send only single prompt setting commands, in
order to avoid double-prompt.

* net/tramp-compat.el (top): Require cl only when compiling.
Reported by Glenn Morris <rgm@gnu.org>.

4 files changed, 29 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f427ca3c9a1..73c2ffce9e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (cd-absolute): Set `list-buffers-directory' in order to
+        show correct path in buffer list.
+
+        * net/tramp.el (tramp-open-connection-setup-interactive-shell)
+        (tramp-find-shell): Send only single prompt setting commands, in
+        order to avoid double-prompt.
+
+        * net/tramp-compat.el (top): Require cl only when compiling.
+        Reported by Glenn Morris <rgm@gnu.org>.
+
 2007-12-18  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
         * progmodes/cc-vars.el (defcustom-c-stylevar): Eval VAL.
diff --git a/lisp/files.el b/lisp/files.el
index 581864f6f46..0aec833445d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -633,7 +633,8 @@ Directories are separated by occurrences of `path-separator'
           (error "%s is not a directory" dir)
         (error "%s: no such directory" dir))
     (if (file-executable-p dir)
-        (setq default-directory dir)
+        (setq default-directory dir
+              list-buffers-directory dir)
       (error "Cannot cd to %s:  Permission denied" dir))))
 
 (defun cd (dir)
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 19d25f43515..b63b8c1e2fb 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -29,10 +29,13 @@
 
 ;;; Code:
 
-(eval-and-compile
+(eval-when-compile
 
   ;; Pacify byte-compiler.
-  (require 'cl)
+  (require 'cl))
+
+(eval-and-compile
+
   (require 'custom)
 
   ;; Load the appropriate timer package.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 95959b15a7c..b81c4e04f81 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -78,7 +78,7 @@
              (when (featurep 'tramp-compat)
                (unload-feature 'tramp-compat 'force))))
 
-(require 'format-spec)                  ;from Gnus 5.8, also in tar ball
+(require 'format-spec)                  ; from Gnus 5.8, also in tar ball
 ;; As long as password.el is not part of (X)Emacs, it shouldn't
 ;; be mandatory
 (if (featurep 'xemacs)
@@ -5365,11 +5365,14 @@ file exists and nonzero exit status otherwise."
           ;; as well.
           (tramp-send-command
            vec
-           (format "PROMPT_COMMAND=''; PS1='%s%s%s'; PS2=''; PS3=''"
+           (format "PS1='%s%s%s'"
                    tramp-rsh-end-of-line
                    tramp-end-of-output
                    tramp-rsh-end-of-line)
            t)
+          (tramp-send-command vec "PS2=''" t)
+          (tramp-send-command vec "PS3=''" t)
+          (tramp-send-command vec "PROMPT_COMMAND=''" t)
           (tramp-message vec 5 "Setting remote shell prompt...done"))
          (t (tramp-message
              vec 5 "Remote `%s' groks tilde expansion, good"
@@ -5638,7 +5641,7 @@ process to set up.  VEC specifies the connection."
     (tramp-send-command
      vec
      (format
-      "exec env 'ENV=' 'PROMPT_COMMAND=' 'PS1=$ ' PS2='' PS3='' %s"
+      "exec env ENV='' PROMPT_COMMAND='' PS1='$ ' PS2='' PS3='' %s"
       (tramp-get-method-parameter
        (tramp-file-name-method vec) 'tramp-remote-sh))
      t)
@@ -5665,11 +5668,14 @@ process to set up.  VEC specifies the connection."
   ;; regarded as prompt already.
   (tramp-send-command
    vec
-   (format "PROMPT_COMMAND=''; PS1='%s%s%s'; PS2=''; PS3=''"
+   (format "PS1='%s%s%s'"
            tramp-rsh-end-of-line
            tramp-end-of-output
            tramp-rsh-end-of-line)
    t)
+  (tramp-send-command vec "PS2=''" t)
+  (tramp-send-command vec "PS3=''" t)
+  (tramp-send-command vec "PROMPT_COMMAND=''" t)
 
   ;; Try to set up the coding system correctly.
   ;; CCC this can't be the right way to do it.  Hm.