Reinstate checking

dired-local-variables-file for dired-x.

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 71551fb85f70df9997185bd3b4b1eddaee44d3e2..5047047ffecc02991c2888bf6e38d3061ff2ee54 100644 (file)
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -2802,11 +2802,10 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
             (host-type (ange-ftp-host-type
                         (car parsed))))
        (or
-;;; This variable seems not to exist in Emacs 19 -- rms.
-;;;     ;; Deal with dired
-;;;     (and (boundp 'dired-local-variables-file)
-;;;          (stringp dired-local-variables-file)
-;;;          (string-equal dired-local-variables-file efile))
+        ;; 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))