(byte-compile-version): Use $Revision, not $Id.

[bpt/emacs.git] / lisp / ange-ftp.el

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 2329cbf..434eaf0 100644 (file)
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -1008,7 +1008,7 @@ only return the directory part of FILE."
   "Read a password, echoing `.' for each character typed.
 End with RET, LFD, or ESC.  DEL or C-h rubs out.  C-u kills line.
 Optional DEFAULT is password to start with."
-  (let ((pass (if default default ""))
+  (let ((pass nil)
        (c 0)
        (echo-keystrokes 0)
        (cursor-in-echo-area t))
@@ -1025,7 +1025,7 @@ Optional DEFAULT is password to start with."
              (setq pass (substring pass 0 -1))))))
     (message "")
     (ange-ftp-repaint-minibuffer)
-    pass))
+    (or pass default "")))
 
 (defmacro ange-ftp-generate-passwd-key (host user)
   (` (concat (, host) "/" (, user))))
@@ -1102,7 +1102,7 @@ Optional DEFAULT is password to start with."
                            ;; found another machine with the same user.
                            ;; Try that account.
                            (ange-ftp-read-passwd
-                            (format "passwd for %s@%s (same as %s@%s): "
+                            (format "passwd for %s@%s (default same as %s@%s): "
                                     user host user other)
                             (ange-ftp-lookup-passwd other user))
                          
@@ -1361,14 +1361,16 @@ Optional DEFAULT is password to start with."
           (ange-ftp-ftp-name buffer-file-name))
       (auto-save-mode ange-ftp-auto-save)))
 
-(defun ange-ftp-kill-ftp-process (buffer)
-  "Kill the FTP process associated with BUFFER.
+(defun ange-ftp-kill-ftp-process (&optional buffer)
+  "Kill the FTP process associated with BUFFER (the current buffer, if nil).
 If the BUFFER's visited filename or default-directory is an ftp filename
 then kill the related ftp process."
   (interactive "bKill FTP process associated with buffer: ")
   (if (null buffer)
-      (setq buffer (current-buffer)))
-  (let ((file (or (buffer-file-name) default-directory)))
+      (setq buffer (current-buffer))
+    (setq buffer (get-buffer buffer)))
+  (let ((file (or (buffer-file-name buffer)
+                 (save-excursion (set-buffer buffer) default-directory))))
     (if file
        (let ((parsed (ange-ftp-ftp-name (expand-file-name file))))
          (if parsed
@@ -1490,6 +1492,10 @@ good, skip, fatal, or unknown."
   (let ((buffer (process-buffer proc))
        (old-buffer (current-buffer)))
 
+    ;; Eliminate nulls.
+    (while (string-match "\000+" str)
+      (setq str (replace-match "" nil nil str))) 
+
     ;; see if the buffer is still around... it could have been deleted.
     (if (buffer-name buffer)
        (unwind-protect