diff options
| author | Michael Albinus | 2018-05-14 17:14:17 +0200 |
|---|---|---|
| committer | Michael Albinus | 2018-05-14 17:14:17 +0200 |
| commit | 30bd61d67433c72641cb4d9a020b3c263aa6170f (patch) | |
| tree | 972adedab76ee56da1c899ae3939639983940a00 | |
| parent | d15fa1b7d36a32e1dd9807eb5f0d1d8cd4f2e78d (diff) | |
| download | emacs-30bd61d67433c72641cb4d9a020b3c263aa6170f.tar.gz emacs-30bd61d67433c72641cb4d9a020b3c263aa6170f.zip | |
* lisp/net/ange-ftp.el (ange-ftp-allow-child-lookup):
Do not use obsolete ´dired-local-variables-file'.
| -rw-r--r-- | lisp/net/ange-ftp.el | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c3650afa9a7..cf9667ac628 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -2868,7 +2868,6 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained." | |||
| 2868 | ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid | 2868 | ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid |
| 2869 | ;; subdirectory. This is of course an OS dependent judgment. | 2869 | ;; subdirectory. This is of course an OS dependent judgment. |
| 2870 | 2870 | ||
| 2871 | (defvar dired-local-variables-file) | ||
| 2872 | (defmacro ange-ftp-allow-child-lookup (dir file) | 2871 | (defmacro ange-ftp-allow-child-lookup (dir file) |
| 2873 | `(not | 2872 | `(not |
| 2874 | (let* ((efile ,file) ; expand once. | 2873 | (let* ((efile ,file) ; expand once. |
| @@ -2877,10 +2876,6 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained." | |||
| 2877 | (host-type (ange-ftp-host-type | 2876 | (host-type (ange-ftp-host-type |
| 2878 | (car parsed)))) | 2877 | (car parsed)))) |
| 2879 | (or | 2878 | (or |
| 2880 | ;; Deal with dired | ||
| 2881 | (and (boundp 'dired-local-variables-file) ; in the dired-x package | ||
| 2882 | (stringp dired-local-variables-file) | ||
| 2883 | (string-equal dired-local-variables-file efile)) | ||
| 2884 | ;; No dots in dir names in vms. | 2879 | ;; No dots in dir names in vms. |
| 2885 | (and (eq host-type 'vms) | 2880 | (and (eq host-type 'vms) |
| 2886 | (string-match "\\." efile)) | 2881 | (string-match "\\." efile)) |