aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-11-29 04:32:05 +0000
committerGlenn Morris2007-11-29 04:32:05 +0000
commit132d5910a04491bac9326bc89ed7401855a84777 (patch)
tree70625ec9a266a2a2ce5b6700dd399c5bb4bc635b
parent5f6d833159f582b2773cbe25681377b2702f05a9 (diff)
downloademacs-132d5910a04491bac9326bc89ed7401855a84777.tar.gz
emacs-132d5910a04491bac9326bc89ed7401855a84777.zip
(url-file-build-filename, url-file): Wrap uses of
efs in (featurep 'xemacs) test.
-rw-r--r--lisp/url/url-file.el22
1 files changed, 12 insertions, 10 deletions
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 9af3bbb42b4..cedf98a3ad3 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -119,8 +119,9 @@ to them."
119 (cond 119 (cond
120 ((featurep 'ange-ftp) 120 ((featurep 'ange-ftp)
121 (ange-ftp-set-passwd host user pass)) 121 (ange-ftp-set-passwd host user pass))
122 ((or (featurep 'efs) (featurep 'efs-auto)) 122 ((when (featurep 'xemacs)
123 (efs-set-passwd host user pass)) 123 (or (featurep 'efs) (featurep 'efs-auto)
124 (efs-set-passwd host user pass))))
124 (t 125 (t
125 nil))) 126 nil)))
126 127
@@ -214,14 +215,15 @@ to them."
214 new (current-buffer) 215 new (current-buffer)
215 callback cbargs) 216 callback cbargs)
216 t) 217 t)
217 (autoload 'efs-copy-file-internal "efs") 218 (when (featurep 'xemacs)
218 (efs-copy-file-internal filename (efs-ftp-path filename) 219 (autoload 'efs-copy-file-internal "efs")
219 new (efs-ftp-path new) 220 (efs-copy-file-internal filename (efs-ftp-path filename)
220 t nil 0 221 new (efs-ftp-path new)
221 (list 'url-file-asynch-callback 222 t nil 0
222 new (current-buffer) 223 (list 'url-file-asynch-callback
223 callback cbargs) 224 new (current-buffer)
224 0 nil)))))) 225 callback cbargs)
226 0 nil)))))))
225 buffer)) 227 buffer))
226 228
227(defmacro url-file-create-wrapper (method args) 229(defmacro url-file-create-wrapper (method args)