[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105393: * net/tramp-sh.el (tramp-ope
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105393: * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell) |
Date: |
Wed, 03 Aug 2011 21:31:18 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105393
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-03 21:31:18 +0200
message:
* net/tramp-sh.el (tramp-open-connection-setup-interactive-shell)
(tramp-open-shell): Use `tramp-shell-quote-argument'.
* net/trampver.el: Update release number.
modified:
lisp/ChangeLog
lisp/net/tramp-sh.el
lisp/net/trampver.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-08-03 02:00:22 +0000
+++ b/lisp/ChangeLog 2011-08-03 19:31:18 +0000
@@ -1,3 +1,10 @@
+2011-08-03 Michael Albinus <address@hidden>
+
+ * 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 <address@hidden>
* progmodes/sh-script.el (sh-font-lock-paren): Don't mistake "main" for
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2011-07-27 11:22:22 +0000
+++ b/lisp/net/tramp-sh.el 2011-08-03 19:31:18 +0000
@@ -3640,11 +3640,11 @@
(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 @@
(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)
=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el 2011-07-30 14:57:12 +0000
+++ b/lisp/net/trampver.el 2011-08-03 19:31:18 +0000
@@ -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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105393: * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell),
Michael Albinus <=