emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r101099: * net/tramp.el (tramp-handle


From: Michael Albinus
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r101099: * net/tramp.el (tramp-handle-make-symbolic-link): Flush file
Date: Tue, 17 Aug 2010 06:52:16 +0200
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 101099
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2010-08-17 06:52:16 +0200
message:
  * net/tramp.el (tramp-handle-make-symbolic-link): Flush file
  properties.
  (tramp-handle-process-file): Call the program in a subshell, in
  order to preserve working directory.
  (tramp-action-password): Hide password prompt before next run.
  (tramp-process-actions): Widen connection buffer for the trace.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-16 03:34:10 +0000
+++ b/lisp/ChangeLog    2010-08-17 04:52:16 +0000
@@ -1,3 +1,12 @@
+2010-08-17  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-handle-make-symbolic-link): Flush file
+       properties.
+       (tramp-handle-process-file): Call the program in a subshell, in
+       order to preserve working directory.
+       (tramp-action-password): Hide password prompt before next run.
+       (tramp-process-actions): Widen connection buffer for the trace.
+
 2010-08-16  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-log-process-buffers): New option.

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-08-10 09:58:15 +0000
+++ b/lisp/net/tramp.el 2010-08-17 04:52:16 +0000
@@ -2552,7 +2552,7 @@
       (unless ln
        (tramp-error
         l 'file-error
-        "Making a symbolic link. ln(1) does not exist on the remote host."))
+        "Making a symbolic link.  ln(1) does not exist on the remote host."))
 
       ;; Do the 'confirm if exists' thing.
       (when (file-exists-p linkname)
@@ -2573,6 +2573,9 @@
              (tramp-file-name-localname
               (tramp-dissect-file-name (expand-file-name filename)))))
 
+      (tramp-flush-file-property l (file-name-directory l-localname))
+      (tramp-flush-file-property l l-localname)
+
       ;; Right, they are on the same host, regardless of user, method, etc.
       ;; We now make the link on the remote machine. This will occur as the 
user
       ;; that FILENAME belongs to.
@@ -4638,7 +4641,9 @@
        (setq outbuf (current-buffer))))
       (when stderr (setq command (format "%s 2>%s" command stderr)))
 
-      ;; Send the command.  It might not return in time, so we protect it.
+      ;; Send the command.  It might not return in time, so we protect
+      ;; it.  Call it in a subshell, in order to preserve working
+      ;; directory.
       (condition-case nil
          (unwind-protect
               (setq ret
@@ -4646,7 +4651,7 @@
                      v (format "\\cd %s; %s"
                                (tramp-shell-quote-argument localname)
                                command)
-                    nil t))
+                    t t))
            ;; We should show the output anyway.
            (when outbuf
              (with-current-buffer outbuf
@@ -6698,8 +6703,10 @@
   "Query the user for a password."
   (with-current-buffer (process-buffer proc)
     (tramp-check-for-regexp proc tramp-password-prompt-regexp)
-    (tramp-message vec 3 "Sending %s" (match-string 1)))
-  (tramp-enter-password proc))
+    (tramp-message vec 3 "Sending %s" (match-string 1))
+    (tramp-enter-password proc)
+    ;; Hide password prompt.
+    (narrow-to-region (point-max) (point-max))))
 
 (defun tramp-action-succeed (proc vec)
   "Signal success in finding shell prompt."
@@ -6810,6 +6817,7 @@
                      (tramp-process-one-action proc vec actions))
                  (tramp-process-one-action proc vec actions)))))
       (with-current-buffer (tramp-get-connection-buffer vec)
+       (widen)
        (tramp-message vec 6 "\n%s" (buffer-string)))
       (unless (eq exit 'ok)
        (tramp-clear-passwd vec)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]