[Emacs-diffs] Changes to emacs/lisp/url/url-file.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/11/29 04:32:05

Index: url-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-file.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- url-file.el 21 Nov 2007 03:05:58 -0000      1.18
+++ url-file.el 29 Nov 2007 04:32:05 -0000      1.19
@@ -119,8 +119,9 @@
         (cond
          ((featurep 'ange-ftp)
           (ange-ftp-set-passwd host user pass))
-         ((or (featurep 'efs) (featurep 'efs-auto))
-          (efs-set-passwd host user pass))
+         ((when (featurep 'xemacs)
+             (or (featurep 'efs) (featurep 'efs-auto)
+                 (efs-set-passwd host user pass))))
          (t
           nil)))
 
@@ -214,6 +215,7 @@
                                                   new (current-buffer)
                                                   callback cbargs)
                                             t)
+              (when (featurep 'xemacs)
              (autoload 'efs-copy-file-internal "efs")
              (efs-copy-file-internal filename (efs-ftp-path filename)
                                      new (efs-ftp-path new)
@@ -221,7 +223,7 @@
                                      (list 'url-file-asynch-callback
                                            new (current-buffer)
                                            callback cbargs)
-                                     0 nil))))))
+                                        0 nil)))))))
     buffer))
 
 (defmacro url-file-create-wrapper (method args)