From cc38a294160ba6f41468f69bb33ef5a93a48d323 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 20 Oct 2005 14:17:14 +0000 Subject: [PATCH] Remove XEmacs conditionals. --- lisp/url/url-dired.el | 4 +--- lisp/url/url-file.el | 8 ++------ lisp/url/url-handlers.el | 15 ++------------- lisp/url/url-http.el | 4 +--- lisp/url/url-nfs.el | 8 ++------ 5 files changed, 8 insertions(+), 31 deletions(-) diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el index 7c635d13e3b..b5ff892721e 100644 --- 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 44a4f8bd9f4..64766930c43 100644 --- 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 bbbf19f53fc..4fa52572a94 100644 --- 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 89b7be42c47..39db321c080 100644 --- 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 858cd029a85..e6822efc242 100644 --- 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) -- 2.39.5