From: yamaoka <yamaoka>
Date: Mon, 17 Apr 2000 03:06:24 +0000 (+0000)
Subject: Sync with latest Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~124
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6384a5b891378c16bbafd2da3899ec3748ebcd36;p=elisp%2Fgnus.git-

Sync with latest Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 244849b..6b77e61 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-14 18:50:04  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-util.el (mm-char-or-char-int-p): New alias.
+	* nnweb.el (nnweb-decode-entities): Check the validity of numeric 
+	entities.
+
 2000-04-10   Daiki Ueno  <ueno@unixuser.org>
 
         * lisp/imap.el (imap-body-lines): Check Content-Type: of the
diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index d7dc793..f23c873 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -94,6 +94,13 @@
 	   prompt (mapcar (lambda (s) (list (symbol-name (car s))))
 			  mm-mime-mule-charset-alist)))))))
 
+(eval-and-compile
+  (defalias 'mm-char-or-char-int-p
+    (cond 
+     ((fboundp 'char-or-char-int-p) 'char-or-char-int-p)
+     ((fboundp 'char-valid-p) 'char-valid-p) 
+     (t 'identity))))
+
 (defvar mm-coding-system-list nil)
 (defun mm-get-coding-system-list ()
   "Get the coding system list."
diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 3c7e32b..5df3018 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -724,7 +724,10 @@ and `altavista'.")
   (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
     (replace-match (char-to-string 
 		    (if (eq (aref (match-string 1) 0) ?\#)
-			(string-to-number (substring (match-string 1) 1))
+			(let ((c
+			       (string-to-number (substring 
+						  (match-string 1) 1))))
+			  (if (mm-char-or-char-int-p c) c 32))
 		      (or (cdr (assq (intern (match-string 1))
 				     w3-html-entities))
 			  ?#)))