[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v [EMACS_22_BASE]

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Michael Albinus <albinus>       08/02/02 10:46:10

Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.124.2.9
retrieving revision 1.124.2.10
diff -u -b -r1.124.2.9 -r1.124.2.10
--- tramp.el    7 Jan 2008 01:56:12 -0000       1.124.2.9
+++ tramp.el    2 Feb 2008 10:46:08 -0000       1.124.2.10
@@ -3985,7 +3985,7 @@
     ;; UNIQUIFY element of `auto-save-file-name-transforms'); but for
     ;; all other cases we must do it ourselves.
     (when (boundp 'auto-save-file-name-transforms)
-      (mapcar
+      (mapc
        '(lambda (x)
          (when (and (string-match (car x) buffer-file-name)
                     (not (car (cddr x))))
@@ -4768,9 +4768,9 @@
                        "\\(" tramp-host-regexp x-nil   "\\)$")
                1 2 3 nil)))
 
-    (mapcar (lambda (regexp)
-      (add-to-list 'result
-       (tramp-completion-dissect-file-name1 regexp name)))
+    (mapc
+     (lambda (regexp)
+       (add-to-list 'result (tramp-completion-dissect-file-name1 regexp name)))
       (list
        tramp-completion-file-name-structure1
        tramp-completion-file-name-structure2
@@ -5264,7 +5264,7 @@
                      "then echo tramp_executable $d/%s; "
                      "break; fi; done <<'EOF'")
              progname progname progname))
-    (mapcar (lambda (d)
+    (mapc (lambda (d)
               (tramp-send-command multi-method method user host d))
             dirlist)
     (tramp-send-command multi-method method user host "EOF")
@@ -6256,9 +6256,18 @@
   ;; the last time we sent a command, to avoid tramp-send-command to send
   ;; "echo are you awake".
   (setq tramp-last-cmd-time (current-time))
+  (tramp-send-command-internal multi-method method user host
+                              "PROMPT_COMMAND=''")
+  (erase-buffer)
+  (tramp-send-command-internal multi-method method user host
+                              "PS2=''")
+  (erase-buffer)
+  (tramp-send-command-internal multi-method method user host
+                              "PS3=''")
+  (erase-buffer)
   (tramp-send-command
    multi-method method user host
-   (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))