Remove XEmacs conditionals.

diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 7c635d13e3b5a8c5dcc8f61083beab0156ffa904..b5ff892721ebb5f137e397f47cef9731b6d2e877 100644 (file)
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -31,9 +31,7 @@
 (defvar url-dired-minor-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-m" 'url-dired-find-file)
-    (if (featurep 'xemacs)
-       (define-key map [button2] 'url-dired-find-file-mouse)
-      (define-key map [mouse-2] 'url-dired-find-file-mouse))
+    (define-key map [mouse-2] 'url-dired-find-file-mouse)
     map)
   "Keymap used when browsing directories.")
 

diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 44a4f8bd9f48f24597c59b10a909e58c457d68e2..64766930c4356dea8ccbd63af22ad83fd75d9040 100644 (file)
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -230,12 +230,8 @@ to them."
 (url-file-create-wrapper file-readable-p (url))
 (url-file-create-wrapper file-writable-p (url))
 (url-file-create-wrapper file-executable-p (url))
-(if (featurep 'xemacs)
-    (progn
-      (url-file-create-wrapper directory-files (url &optional full match nosort files-only))
-      (url-file-create-wrapper file-truename (url &optional default)))
-  (url-file-create-wrapper directory-files (url &optional full match nosort))
-  (url-file-create-wrapper file-truename (url &optional counter prev-dirs)))
+(url-file-create-wrapper directory-files (url &optional full match nosort))
+(url-file-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (provide 'url-file)
 

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index bbbf19f53fcb4e527d122acca40d1fd6d59285ea..4fa52572a94eb17a5e08fcc002066ceeb4e7d995 100644 (file)
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -246,19 +246,8 @@ accessible."
 (url-handlers-create-wrapper file-writable-p (url))
 (url-handlers-create-wrapper file-directory-p (url))
 (url-handlers-create-wrapper file-executable-p (url))
-
-(if (featurep 'xemacs)
-    (progn
-      ;; XEmacs specific prototypes
-      (url-handlers-create-wrapper
-       directory-files (url &optional full match nosort files-only))
-      (url-handlers-create-wrapper
-       file-truename (url &optional default)))
-  ;; Emacs specific prototypes
-  (url-handlers-create-wrapper
-   directory-files (url &optional full match nosort))
-  (url-handlers-create-wrapper
-   file-truename (url &optional counter prev-dirs)))
+(url-handlers-create-wrapper directory-files (url &optional full match nosort))
+(url-handlers-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (add-hook 'find-file-hook 'url-handlers-set-buffer-mode)
 

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 89b7be42c476c4d7f71d4f4a0bacab6683515cd4..39db321c080d6f7cb3ee64154b4a73c87a1ffd17 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -840,9 +840,7 @@ the end of the document."
                                 (list 'start-open t
                                       'end-open t
                                       'chunked-encoding t
-                                      'face (if (featurep 'xemacs)
-                                                'text-cursor
-                                              'cursor)
+                                      'face 'cursor
                                       'invisible t))
            (setq url-http-chunked-length (string-to-number (buffer-substring
                                                              (match-beginning 1)

diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index 858cd029a8563a3eae50bae01bc13aa0f9d53b8c..e6822efc2429f7c8299f1f579de994fc26587c97 100644 (file)
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -87,12 +87,8 @@ Each can be used any number of times.")
 (url-nfs-create-wrapper file-readable-p (url))
 (url-nfs-create-wrapper file-writable-p (url))
 (url-nfs-create-wrapper file-executable-p (url))
-(if (featurep 'xemacs)
-    (progn
-      (url-nfs-create-wrapper directory-files (url &optional full match nosort files-only))
-      (url-nfs-create-wrapper file-truename (url &optional default)))
-  (url-nfs-create-wrapper directory-files (url &optional full match nosort))
-  (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs)))
+(url-nfs-create-wrapper directory-files (url &optional full match nosort))
+(url-nfs-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (provide 'url-nfs)