[Emacs-diffs] Changes to emacs/lisp/net/ange-ftp.el

[Juanma Barranquero]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.64 emacs/lisp/net/ange-ftp.el:1.65
*** emacs/lisp/net/ange-ftp.el:1.64     Tue May 17 16:24:36 2005
--- emacs/lisp/net/ange-ftp.el  Wed May 18 10:18:42 2005
***************
*** 1646,1652 ****
                    ;; if we gave an empty password to the USER command earlier
                    ;; then we should send a null password now.
                    (if (string-match "Password: *$" ange-ftp-process-string)
!                       (send-string proc "\n"))))
              (while (and ange-ftp-process-busy
                          (string-match "\n" ange-ftp-process-string))
                (let ((line (substring ange-ftp-process-string
--- 1646,1652 ----
                    ;; if we gave an empty password to the USER command earlier
                    ;; then we should send a null password now.
                    (if (string-match "Password: *$" ange-ftp-process-string)
!                       (process-send-string proc "\n"))))
              (while (and ange-ftp-process-busy
                          (string-match "\n" ange-ftp-process-string))
                (let ((line (substring ange-ftp-process-string
***************
*** 1741,1758 ****
      ;; Replace STR by the result of the comint processing.
      (setq str (buffer-substring comint-last-output-start (process-mark 
proc))))
    (cond ((string-match "login: *$" str)
!        (send-string proc
!                     (concat
!                      (let ((ange-ftp-default-user t))
!                        (ange-ftp-get-user ange-ftp-gateway-host))
!                      "\n")))
        ((string-match "Password: *$" str)
!        (send-string proc
!                     (concat
!                      (ange-ftp-get-passwd ange-ftp-gateway-host
!                                           (ange-ftp-get-user
!                                            ange-ftp-gateway-host))
!                      "\n")))
        ((string-match ange-ftp-gateway-fatal-msgs str)
         (delete-process proc)
         (setq ange-ftp-gwp-running nil))
--- 1741,1758 ----
      ;; Replace STR by the result of the comint processing.
      (setq str (buffer-substring comint-last-output-start (process-mark 
proc))))
    (cond ((string-match "login: *$" str)
!        (process-send-string proc
!                               (concat
!                                (let ((ange-ftp-default-user t))
!                                  (ange-ftp-get-user ange-ftp-gateway-host))
!                                "\n")))
        ((string-match "Password: *$" str)
!        (process-send-string proc
!                               (concat
!                                (ange-ftp-get-passwd ange-ftp-gateway-host
!                                                     (ange-ftp-get-user
!                                                      ange-ftp-gateway-host))
!                                "\n")))
        ((string-match ange-ftp-gateway-fatal-msgs str)
         (delete-process proc)
         (setq ange-ftp-gwp-running nil))
***************
*** 1835,1841 ****
              (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n")
            (insert cmd)))
        (move-marker comint-last-input-end (point))
!       (send-string proc cmd)
        (set-marker (process-mark proc) (point))
        (if nowait
            nil
--- 1835,1841 ----
              (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n")
            (insert cmd)))
        (move-marker comint-last-input-end (point))
!       (process-send-string proc cmd)
        (set-marker (process-mark proc) (point))
        (if nowait
            nil