shr: Render td content with shr-descend

[gnus] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index beb889e..7274cb0 100644 (file)
--- 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,8 +296,11 @@ dgnushack-compile."
                 '("md5.el")
               '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el")))
       (setq files (delete file files)))
-    (unless (fboundp 'libxml-parse-html-region)
-      (setq files (delete "shr.el" 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))