[Emacs-diffs] trunk r113915: * lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):

[Glenn Morris]

------------------------------------------------------------
revno: 113915
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15058
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-16 00:13:48 -0700
message:
  * lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
  Handle "Remote Directory" response of some clients.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/ange-ftp.el           angeftp.el-20091113204419-o5vbwnq5f7feedwu-1784

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-16 06:53:41 +0000
+++ b/lisp/ChangeLog    2013-08-16 07:13:48 +0000
@@ -1,5 +1,8 @@
 2013-08-16  Glenn Morris  <address@hidden>
 
+       * net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
+       Handle "Remote Directory" response of some clients.  (Bug#15058)
+
        * emacs-lisp/bytecomp.el (byte-compile-make-variable-buffer-local):
        Tweak warning.  (Bug#14926)
 

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2013-08-09 21:22:44 +0000
+++ b/lisp/net/ange-ftp.el      2013-08-16 07:13:48 +0000
@@ -1,7 +1,6 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
-;; Copyright (C) 1989-1996, 1998, 2000-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1989-1996, 1998, 2000-2013 Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (address@hidden)
 ;; Maintainer: FSF
@@ -700,7 +699,7 @@
   "Regular expression matching the start of a multiline FTP reply.")
 
 (defvar ange-ftp-good-msgs
-  "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark"
+  "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark\\|^Remote 
directory:"
   "Regular expression matching FTP \"success\" messages.")
 
 ;; CMS and the odd VMS machine say 200 Port rather than 200 PORT.
@@ -3021,6 +3020,9 @@
     (if (car result)
        (save-match-data
          (and (or (string-match "\"\\([^\"]*\\)\"" line)
+                  ;; Some clients cache the value and return it in
+                  ;; this way without asking the server.  (Bug#15058)
+                  (string-match "^Remote directory: \\(.*\\)" line)
                   (string-match " \\([^ ]+\\) " line)) ; stone-age VMS servers!
               (setq dir (match-string 1 line)))))
     (cons dir line)))