2000-10-08 13:05:11 ShengHuo ZHU <zsh@cs.rochester.edu>

	* dgnushack.el (dgnushack-compile): Delete old elc files first.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c01464a..40e008c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-08 13:05:11  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * dgnushack.el (dgnushack-compile): Delete old elc files first.
+
 2000-10-08 10:59:13  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-ems.el (gnus-kill-all-overlays): Move here.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index a425049..f5e49d0 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -115,7 +115,6 @@ You also then need to add the following to the lisp/dgnushack.el file:
 
 Modify to suit your needs."))
   (let ((files (directory-files srcdir nil "^[^=].*\\.el$"))
-       (xemacs (featurep 'xemacs))
        ;;(byte-compile-generate-call-tree t)
        file elc)
     (dolist (file '("dgnushack.el" "lpath.el"))
@@ -128,19 +127,25 @@ Modify to suit your needs."))
        (dolist (file '("nnweb.el" "nnlistserv.el" "nnultimate.el"
                       "nnslashdot.el" "nnwarchive.el" "webmail.el"))
         (setq files (delete file files)))))
+    (dolist (file 
+            (if (featurep 'xemacs)
+                '("md5.el" "smiley-ems.el")
+              '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el" 
+                "nnheaderxm.el" "smiley.el")))
+      (setq files (delete file files)))
+
+    (dolist (file files)
+      (setq file (expand-file-name file srcdir))
+      (when (and (file-exists-p (setq elc (concat file "c")))
+                (file-newer-than-file-p file elc))
+       (delete-file elc)))
+    
     (while (setq file (pop files))
       (setq file (expand-file-name file srcdir))
-      (when (or (and (not xemacs)
-                    (not (member (file-name-nondirectory file)
-                                 '("gnus-xmas.el" "gnus-picon.el"
-                                   "messagexmas.el" "nnheaderxm.el" 
-                                   "smiley.el"))))
-               (and xemacs
-                    (not (member file '("md5.el" "smiley-ems.el")))))
-       (when (or (not (file-exists-p (setq elc (concat file "c"))))
-                 (file-newer-than-file-p file elc))
-         (ignore-errors
-           (byte-compile-file file)))))))
+      (when (or (not (file-exists-p (setq elc (concat file "c"))))
+               (file-newer-than-file-p file elc))
+       (ignore-errors
+         (byte-compile-file file))))))
 
 (defun dgnushack-recompile ()
   (require 'gnus)

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 7d94959..a173559 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -336,22 +336,24 @@ and `altavista'.")
     (funcall callback t)
     (gnus-kill-buffer url-working-buffer)))
 
+(defun nnweb-url-retrieve-asynch (url callback &rest data)
+  (let ((url-request-method "GET")
+       (old-asynch url-be-asynchronous)
+       (url-request-data nil)
+       (url-request-extra-headers nil)
+       (url-working-buffer (generate-new-buffer-name " *nnweb*")))
+    (setq-default url-be-asynchronous t)
+    (save-excursion
+      (set-buffer (get-buffer-create url-working-buffer))
+      (setq url-current-callback-data data
+           url-be-asynchronous t
+           url-current-callback-func callback)
+      (url-retrieve url nil))
+    (setq-default url-be-asynchronous old-asynch)))
+
 (if (fboundp 'url-retrieve-synchronously)
-    (defalias 'nnweb-url-retrieve-asynch 'url-retrieve)
-  (defun nnweb-url-retrieve-asynch (url callback &rest data)
-    (let ((url-request-method "GET")
-         (old-asynch url-be-asynchronous)
-         (url-request-data nil)
-         (url-request-extra-headers nil)
-         (url-working-buffer (generate-new-buffer-name " *nnweb*")))
-      (setq-default url-be-asynchronous t)
-      (save-excursion
-       (set-buffer (get-buffer-create url-working-buffer))
-       (setq url-current-callback-data data
-             url-be-asynchronous t
-             url-current-callback-func callback)
-       (url-retrieve url nil))
-      (setq-default url-be-asynchronous old-asynch))))
+    (defun nnweb-url-retrieve-asynch (url callback &rest data)
+      (url-retrieve url callback data)))
 
 ;;;
 ;;; DejaNews functions.