lisp/url/ file with Xemacs compatibility code removed

lisp/url/ file with Xemacs compatibility code removed

[CHENG Gao]

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

Attached is diff file for related changes.
If it's desirable to remove Xemacs compatibility code from url package
(as I think, it's merged into Emacs project, so it's not expected to
maintain this compatibility any more), please take a look. Otherwise
please ignore it.


[-- Attachment #2: url-diff --]
[-- Type: application/octet-stream, Size: 3515 bytes --]

--- d:/emacs/lisp/url/url-dired.el	2004-10-28 19:26:58.703125000 +0800
+++ d:/url/url-dired.el	2004-10-28 19:32:35.156250000 +0800
@@ -30,9 +30,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.")
 
--- d:/emacs/lisp/url/url-file.el	2004-10-28 19:26:58.734375000 +0800
+++ d:/url/url-file.el	2004-10-28 19:34:16.312500000 +0800
@@ -231,12 +231,8 @@
 (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)
 
--- d:/emacs/lisp/url/url-handlers.el	2004-10-28 19:26:58.796875000 +0800
+++ d:/url/url-handlers.el	2004-10-28 19:49:35.906250000 +0800
@@ -233,18 +233,11 @@
 (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
+;; 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))
 
 (add-hook 'find-file-hook 'url-handlers-set-buffer-mode)
 
--- d:/emacs/lisp/url/url-http.el	2004-10-28 19:26:58.843750000 +0800
+++ d:/url/url-http.el	2004-10-28 19:50:38.187500000 +0800
@@ -821,9 +821,7 @@
 				 (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-int (buffer-substring
 							  (match-beginning 1)
--- d:/emacs/lisp/url/url-nfs.el	2004-10-28 19:26:59.046875000 +0800
+++ d:/url/url-nfs.el	2004-10-28 19:51:17.812500000 +0800
@@ -86,12 +86,8 @@
 (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)
 

 

[-- Attachment #3: Type: text/plain, Size: 47 bytes --]


-- 
德不孤，必有邻
         -- 《论语-里仁》


[-- Attachment #4: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: lisp/url/ file with Xemacs compatibility code removed

[Richard Stallman]

The changes you wrote look correct to me in a quick glance, but before
installing such changes, I would rather wait a little while and see
who will pick up maintenance of the url package.  If that person
intends to maintain it for XEmacs too and wants to keep that
compatibility code, it is ok with me to keep it.  Otherwise we may as
well remove it.

Are you offering to maintain the url directory?

Re: lisp/url/ file with Xemacs compatibility code removed

[CHENG Gao]

Thank you very much for your trust. But I think I can not maintain it
because I am an Elisp newbie.

I just wanna do my best to help Emacs development, but I can not do this
kind of important job.

-- 
花开花谢春不管，拂意事休对人言
水暖水寒鱼自知，会心处还期独赏