(ange-ftp-allow-child-lookup): Re-enable since

the last patch works around the wu-ftpd misfeature that prompted
the disabling of this optimization.

2 files changed, 36 insertions, 38 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 849b4477b59..91da468b6b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-21  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * net/ange-ftp.el (ange-ftp-allow-child-lookup): Re-enable since
+        the last patch works around the wu-ftpd misfeature that prompted
+        the disabling of this optimization.
+
 2002-05-21  Colin Walters  <walters@gnu.org>
 
         * international/mule.el (make-coding-system): Doc fixes.
@@ -7,11 +13,11 @@
         (set-auto-coding): Update docs.
         (sgml-xml-auto-coding-function): New function.
 
-        * international/mule-util.el (truncate-string-to-width): New
-        optional argument `ellipsis'.  Add commented-out test suite, and
+        * international/mule-util.el (truncate-string-to-width):
+        New optional argument `ellipsis'.  Add commented-out test suite, and
         change coding to iso-2022-7bit.
 
-2002-05-21  Colin Walters  <walters@verbum.org> 
+2002-05-21  Colin Walters  <walters@verbum.org>
 
         * font-lock.el (font-lock-defaults, font-lock-defaults-alist)
         (font-lock-multiline, font-lock-fontified, font-lock-mode)
@@ -22,8 +28,8 @@
         * font-core.el: New file, with functions taken from font-lock.el.
         (font-lock-category-alist): New variable.
         (font-lock-mode): Use it.
-        (font-lock-set-defaults): Partially taken from font-lock.el.  Only
-        load font-lock.el when necessary.
+        (font-lock-set-defaults): Partially taken from font-lock.el.
+        Only load font-lock.el when necessary.
 
         * loadup.el: Add font-core.el.
 
@@ -35,7 +41,7 @@
         (occur-engine): Use categories from `font-lock-category-alist'.
 
         * info.el (Info-fontify): Deleted.
-        (Info-select-node): Don't use it.       
+        (Info-select-node): Don't use it.
         (Info-mode-hook): New variable.
         (Info-mode): Set up categories.
         (Info-fontify-menu-headers, Info-fontify-node): Use categories.
@@ -57,7 +63,7 @@
         (ibuffer-insert-filter-group): Ditto.
         (ibuffer-mode): Set up category properties.
 
-2002-05-21  Colin Walters  <walters@debian.org> 
+2002-05-21  Colin Walters  <walters@debian.org>
 
         * replace.el (occur-engine): Increment globalcount all at once
         after searching a buffer.
@@ -65,19 +71,18 @@
 
         * ibuf-macs.el (define-ibuffer-column): Add third argument
         `ibuffer-buf'.
-        
+
         * ibuffer.el (toplevel): Require font-lock, to get the face
         definitions.
         (ibuffer-use-fontification): Deleted.
         (column filename-and-process): New column.
         (ibuffer-formats): Use it by default.
         (ibuffer-name-map, ibuffer-mode-name-map)
-        (ibuffer-filter-group-map): Don't set parent to
-        `ibuffer-mode-map'.
+        (ibuffer-filter-group-map): Don't set parent to `ibuffer-mode-map'.
         (ibuffer-do-save, ibuffer-do-toggle-modified)
         (ibuffer-do-toggle-read-only, ibuffer-do-delete)
         (ibuffer-do-kill-on-deletion-marks): Include name in definition.
-        (ibuffer): New optional argument `formats'.  
+        (ibuffer): New optional argument `formats'.
 
 2002-05-21  Eli Zaretskii  <eliz@is.elta.co.il>
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index dde35b017e3..48dbb55896c 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -2941,34 +2941,27 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
 ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid
 ;;     subdirectory. This is of course an OS dependent judgement.
 
-;;; Nowadays, the judgement for #2 is always "no".
-;;; With today's ftp servers on Unix and GNU systems,
-;;; it appears to be impossible to tell from the result
-;;; of the directory listing whether the argument is a directory.
-;;; This appears to be true even in Emacs 20.7
-
 (defmacro ange-ftp-allow-child-lookup (dir file)
-  nil)
-;;;   `(not
-;;;     (let* ((efile ,file) ; expand once.
-;;;            (edir ,dir)
-;;;            (parsed (ange-ftp-ftp-name edir))
-;;;            (host-type (ange-ftp-host-type
-;;;                        (car parsed))))
-;;;       (or
-;;;        ;; Deal with dired
-;;;        (and (boundp 'dired-local-variables-file) ; in the dired-x package
-;;;             (stringp dired-local-variables-file)
-;;;             (string-equal dired-local-variables-file efile))
-;;;        ;; No dots in dir names in vms.
-;;;        (and (eq host-type 'vms)
-;;;             (string-match "\\." efile))
-;;;        ;; No subdirs in mts of cms.
-;;;        (and (memq host-type '(mts cms))
-;;;             (not (string-equal "/" (nth 2 parsed))))
-;;;        ;; No dots in pseudo-dir names in bs2000.
-;;;        (and (eq host-type 'bs2000)
-;;;             (string-match "\\." efile)))))))
+  `(not
+    (let* ((efile ,file)                ; expand once.
+           (edir ,dir)
+           (parsed (ange-ftp-ftp-name edir))
+           (host-type (ange-ftp-host-type
+                       (car parsed))))
+      (or
+       ;; Deal with dired
+       (and (boundp 'dired-local-variables-file) ; in the dired-x package
+            (stringp dired-local-variables-file)
+            (string-equal dired-local-variables-file efile))
+       ;; No dots in dir names in vms.
+       (and (eq host-type 'vms)
+            (string-match "\\." efile))
+       ;; No subdirs in mts of cms.
+       (and (memq host-type '(mts cms))
+            (not (string-equal "/" (nth 2 parsed))))
+       ;; No dots in pseudo-dir names in bs2000.
+       (and (eq host-type 'bs2000)
+            (string-match "\\." efile))))))
 
 (defun ange-ftp-file-entry-p (name)
   "Given NAME, return whether there is a file entry for it."