mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
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>.
This commit is contained in:
Michael Albinus 2007-12-18 21:02:53 +00:00
parent d2f795854e
commit 9fa0d3aabb
4 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/net/tramp-compat.el
View file

@ -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.

14
lisp/net/tramp.el
View file

@ -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.