Mercurial > emacs
changeset 87322:e99e230d7eb3
* 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>.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Tue, 18 Dec 2007 21:02:53 +0000 |
| parents | 0c95db530576 |
| children | 24f44404f3aa |
| files | lisp/ChangeLog lisp/files.el lisp/net/tramp-compat.el lisp/net/tramp.el |
| diffstat | 4 files changed, 29 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Dec 18 09:21:28 2007 +0000 +++ b/lisp/ChangeLog Tue Dec 18 21:02:53 2007 +0000 @@ -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.
--- a/lisp/files.el Tue Dec 18 09:21:28 2007 +0000 +++ b/lisp/files.el Tue Dec 18 21:02:53 2007 +0000 @@ -633,7 +633,8 @@ (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)
--- a/lisp/net/tramp-compat.el Tue Dec 18 09:21:28 2007 +0000 +++ b/lisp/net/tramp-compat.el Tue Dec 18 21:02:53 2007 +0000 @@ -29,10 +29,13 @@ ;;; Code: +(eval-when-compile + + ;; Pacify byte-compiler. + (require 'cl)) + (eval-and-compile - ;; Pacify byte-compiler. - (require 'cl) (require 'custom) ;; Load the appropriate timer package.
--- a/lisp/net/tramp.el Tue Dec 18 09:21:28 2007 +0000 +++ b/lisp/net/tramp.el Tue Dec 18 21:02:53 2007 +0000 @@ -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 @@ ;; 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 @@ (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 @@ ;; 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.