From 63648a956ad27fbc0e1a33ac0164eb8a5a77f06f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 3 Aug 2011 21:31:18 +0200 Subject: [PATCH] * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell) (tramp-open-shell): Use `tramp-shell-quote-argument'. * net/trampver.el: Update release number. --- lisp/ChangeLog | 7 +++++++ lisp/net/tramp-sh.el | 6 +++--- lisp/net/trampver.el | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a4d4b9cc9c..28d78fa7302 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-08-03 Michael Albinus + + * 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 * progmodes/sh-script.el (sh-font-lock-paren): Don't mistake "main" for diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 5c497748943..428bd6422d8 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -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) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index da51662b216..5492441ac77 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -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))) -- 2.39.2