X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdgnushack.el;h=7274cb0bfe082aca8acb7afcc369d8f50f778600;hb=0007de6d40db139c025a8b2cba9ef04ee4837608;hp=f5bf8720178fd76bce335057f1d4b7c807b6b2f0;hpb=6da7fa4ce49b89c2c5c84b9e2eace629c0b1a625;p=gnus

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index f5bf87201..7274cb0bf 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -35,6 +35,10 @@
 (require 'cl)
 (require 'iswitchb)
 
+(condition-case nil
+    (require 'org-entities)
+  (error nil))
+
 (defvar srcdir (or (getenv "srcdir") "."))
 (defvar loaddir (and load-file-name (file-name-directory load-file-name)))
 
@@ -130,7 +134,6 @@
 
 (eval-and-compile
   (unless (featurep 'xemacs)
-    (defvar iswitchb-temp-buflist)
     (defalias 'get-popup-menu-response 'ignore)
     (defalias 'event-object 'ignore)
     (autoload 'iswitchb-read-buffer "iswitchb")
@@ -237,6 +240,16 @@ in `defcustom' forms."
   (maybe-fbind '(defined-colors face-attribute))
   (maybe-bind '(idna-program installation-directory)))
 
+(when (featurep 'xemacs)
+  (defadvice byte-optimize-apply (before use-mapcan (form) activate)
+    "Replace (apply 'nconc (mapcar ...)) with (mapcan ...)."
+    (let ((last (nth (1- (length form)) form)))
+      (when (and (eq last (third form))
+		 (consp last)
+		 (eq 'mapcar (car last))
+		 (equal (nth 1 form) ''nconc))
+	(setq form (cons 'mapcan (cdr last)))))))
+
 (defun dgnushack-compile-verbosely ()
   "Call dgnushack-compile with warnings ENABLED.  If you are compiling
 patches to gnus, you should consider modifying make.bat to call
@@ -283,6 +296,11 @@ dgnushack-compile."
 		 '("md5.el")
 	       '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el")))
       (setq files (delete file files)))
+    (unless (and (fboundp 'libxml-parse-html-region)
+		 ;; lpath.el binds it.
+		 (not (eq (symbol-function 'libxml-parse-html-region)
+			  'ignore)))
+      (setq files (delete "shr-color.el" (delete "shr.el" files))))
 
     (dolist (file files)
       (setq file (expand-file-name file srcdir))