Mercurial > hg > xemacs-beta

diff lisp/packages/rcompile.el @ 70:131b0175ea99 r20-0b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 56c54cf7c5b6
children cca96a509cfe
line wrap: on
line diff
--- a/lisp/packages/rcompile.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/packages/rcompile.el	Mon Aug 13 09:02:59 2007 +0200
@@ -106,16 +106,12 @@
   "Compile the current buffer's directory on HOST.  Log in as USER.
 See \\[compile]."
   (interactive
-   (let ((parsed 
-	  ;; XEmacs change
-	  (cond
-	   ((featurep 'efs)
-	    (efs-ftp-path default-directory))
-	   ((featurep 'ange-ftp)
-	    (if (fboundp 'ange-ftp-ftp-name)
-		(ange-ftp-ftp-name default-directory)
-	      (ange-ftp-ftp-path default-directory)))
-	   (t nil)))
+   (let ((parsed (and (featurep 'ange-ftp)
+		      ;; XEmacs change
+		      (or (and (fboundp 'ange-ftp-ftp-name)
+			       (ange-ftp-ftp-name default-directory))
+			  (and (fboundp 'ange-ftp-ftp-path)
+			       (ange-ftp-ftp-path default-directory)))))
          host user command prompt)
      (if parsed
          (setq host (nth 0 parsed)
@@ -149,16 +145,12 @@
          (setq remote-compile-user user))
         ((null remote-compile-user)
          (setq remote-compile-user (user-login-name))))
-  (let* ((parsed
-	  ;; XEmacs change
-	  (cond
-	   ((featurep 'efs)
-	    (efs-ftp-path default-directory))
-	   ((featurep 'ange-ftp)
-	    (if (fboundp 'ange-ftp-ftp-name)
-		(ange-ftp-ftp-name default-directory)
-	      (ange-ftp-ftp-path default-directory)))
-	   (t nil)))
+  (let* ((parsed (and (featurep 'ange-ftp)
+		      ;; XEmacs change
+		      (or (and (fboundp 'ange-ftp-ftp-name)
+			       (ange-ftp-ftp-name default-directory))
+			  (and (fboundp 'ange-ftp-ftp-path)
+			       (ange-ftp-ftp-path default-directory)))))
          (compile-command
           (format "%s %s -l %s \"(%scd %s; %s)\""
 		  remote-shell-program