From a631ef4f3db5a838b12a11ce53d6337e8d255221 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 19 May 2000 10:24:08 +0000
Subject: [PATCH] Sync.

---
 lisp/ChangeLog   |   10 ++++++++++
 lisp/gnus-art.el |   26 ++++++++++++--------------
 lisp/mml.el      |    3 ++-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f75001b..ce08482 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-05-19 01:45:40  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+	* mml.el (mml-parse-1): Don't test multiple-charsets within mml tag.
+
+2000-05-18  Dave Love  <fx@gnu.org>
+
+	* gnus-art.el: Use defalias, not fset.
+	(gnus-article-x-face-command): Don't test for xbm.
+	(gnus-article-next-page): Redisplay before testing point in window.
+
 2000-05-17 21:16:54  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-group.el (gnus-group-mode-map): Add M-SPACE.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index aeaba89..937f847 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -211,8 +211,7 @@ regexp.  If it matches, the text in question is not a signature."
 (defcustom gnus-article-x-face-command
   (cond
    ((and (fboundp 'image-type-available-p)
-	 (or (image-type-available-p 'xpm)
-	     (image-type-available-p 'xbm)))
+	 (image-type-available-p 'xbm))
     'gnus-article-display-xface)
    ((and (not gnus-xemacs)
 	 window-system
@@ -2665,17 +2664,16 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 		 gfunc (cdr func))
 	 (setq afunc func
 	       gfunc (intern (format "gnus-%s" func))))
-       (fset gfunc
-	     (if (not (fboundp afunc))
-		 nil
-	       `(lambda (&optional interactive &rest args)
-		  ,(documentation afunc t)
-		  (interactive (list t))
-		  (save-excursion
-		    (set-buffer gnus-article-buffer)
-		    (if interactive
-			(call-interactively ',afunc)
-		      (apply ',afunc args))))))))
+       (defalias gfunc
+	 (if (fboundp afunc)
+	   `(lambda (&optional interactive &rest args)
+	      ,(documentation afunc t)
+	      (interactive (list t))
+	      (save-excursion
+		(set-buffer gnus-article-buffer)
+		(if interactive
+		    (call-interactively ',afunc)
+		  (apply ',afunc args))))))))
    '(article-hide-headers
      article-hide-boring-headers
      article-toggle-headers
@@ -3838,7 +3836,7 @@ In no internal viewer is available, use an external viewer."
 	      (if gnus-show-mime ?m ? )
 	      (if emphasis ?e ? )))))
 
-(fset 'gnus-article-hide-headers-if-wanted 'gnus-article-maybe-hide-headers)
+(defalias 'gnus-article-hide-headers-if-wanted 'gnus-article-maybe-hide-headers)
 
 (defun gnus-article-maybe-hide-headers ()
   "Hide unwanted headers if `gnus-have-all-headers' is nil.
diff --git a/lisp/mml.el b/lisp/mml.el
index 2168a3d..b035bc5 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -137,7 +137,8 @@ The function is called with one parameter, which is the generated part.")
 		  (setq charsets (delq nil charsets))
 		(setq warn nil))
 	    (error "Edit your message to remove those characters")))
-	(if (< (length charsets) 2)
+	(if (or (eq 'mml (car tag))
+		(< (length charsets) 2))
 	    (if (or (not no-markup-p)
 		    (string-match "[^ \t\r\n]" contents))
 		;; Don't create blank parts.
-- 
1.7.10.4