procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell)

Browse source 
(tramp-open-shell): Use `tramp-shell-quote-argument'.

* net/trampver.el: Update release number.
This commit is contained in:
Michael Albinus 2011-08-03 21:31:18 +02:00
parent 568352e761
commit 63648a956a
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2011-08-03 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell)
(tramp-open-shell): Use `tramp-shell-quote-argument'.
* net/trampver.el: Update release number.
2011-08-03 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el (sh-font-lock-paren): Don't mistake "main" for

6
lisp/net/tramp-sh.el
View file

@ -3640,11 +3640,11 @@ file exists and nonzero exit status otherwise."
(when extra-args (setq shell (concat shell " " extra-args)))
(tramp-send-command
vec (format "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
(shell-quote-argument tramp-end-of-output) shell)
(tramp-shell-quote-argument tramp-end-of-output) shell)
t))
;; Setting prompts.
(tramp-send-command
vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
(tramp-send-command vec "PS2=''" t)
(tramp-send-command vec "PS3=''" t)
(tramp-send-command vec "PROMPT_COMMAND=''" t)))
@ -3736,7 +3736,7 @@ process to set up. VEC specifies the connection."
(tramp-message vec 5 "Setting shell prompt")
(tramp-send-command
vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
(tramp-send-command vec "PS2=''" t)
(tramp-send-command vec "PS3=''" t)
(tramp-send-command vec "PROMPT_COMMAND=''" t)

4
lisp/net/trampver.el
View file

@ -31,7 +31,7 @@
;; should be changed only there.
;;;###tramp-autoload
(defconst tramp-version "2.2.2"
(defconst tramp-version "2.2.3-pre"
"This version of Tramp.")
;;;###tramp-autoload
@ -44,7 +44,7 @@
(= emacs-major-version 21)
(>= emacs-minor-version 4)))
"ok"
(format "Tramp 2.2.2 is not fit for %s"
(format "Tramp 2.2.3-pre is not fit for %s"
(when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))