From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 1 Dec 1999 22:37:32 +0000 (+0000)
Subject: * mm-view.el (mm-inline-message): Check whether charset is a
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=798695e262848f8444c315ef228f01e7e600529d;p=gnus

* mm-view.el (mm-inline-message): Check whether charset is a
string.

* nnslashdot.el (nnslashdot-request-post): Insert <p>'s.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2b5cc0fd..c1b37bc2f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 1999-12-01 21:59:36  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* mm-view.el (mm-inline-message): Check whether charset is a
+	string. 
+
+	* nnslashdot.el (nnslashdot-request-post): Insert <p>'s.
+
 	* message.el (message-mode-map): Changed keystroke for
 	message-yank-buffer. 
 
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index a4f98300f..908fa8aac 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -187,7 +187,8 @@
 	(charset (mail-content-type-get
 		  (mm-handle-type handle) 'charset))
 	gnus-displaying-mime handles)
-    (when charset
+    (when (and charset
+	       (stringp charset))
       (setq charset (intern (downcase charset)))
       (when (eq charset 'us-ascii)
 	(setq charset nil)))
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 62b43b750..450de3229 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -337,24 +337,24 @@
 		      (buffer-substring
 		       (re-search-forward "<td[^>]+>")
 		       (search-forward "</td>")))))))
-      (search-failed (nnslashdot-lose why))))
+      (search-failed (nnslashdot-lose why)))
 
-  (when contents
-    (save-excursion
-      (set-buffer (or buffer nntp-server-buffer))
-      (erase-buffer)
-      (insert contents)
-      (goto-char (point-min))
-      (while (search-forward "<br><br>" nil t)
-	(replace-match "<p>" t t))
-      (goto-char (point-min))
-      (insert "Content-Type: text/html\nMIME-Version: 1.0\n")
-      (insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
-	      "\n")
-      (let ((header (cdr (assq article nnslashdot-headers))))
-	(nnheader-insert-header header))
-      (nnheader-report 'nnslashdot "Fetched article %s" article)
-      (cons group article)))))
+    (when contents
+      (save-excursion
+	(set-buffer (or buffer nntp-server-buffer))
+	(erase-buffer)
+	(insert contents)
+	(goto-char (point-min))
+	(while (search-forward "<br><br>" nil t)
+	  (replace-match "<p>" t t))
+	(goto-char (point-min))
+	(insert "Content-Type: text/html\nMIME-Version: 1.0\n")
+	(insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
+		"\n")
+	(let ((header (cdr (assq article nnslashdot-headers))))
+	  (nnheader-insert-header header))
+	(nnheader-report 'nnslashdot "Fetched article %s" article)
+	(cons group article)))))
 
 (deffoo nnslashdot-close-server (&optional server)
   (when (and (nnslashdot-server-opened server)
@@ -441,6 +441,9 @@
 	  (insert "</blockquote>\n")
 	  (setq quoted nil)))
       (forward-line 1))
+    (goto-char (point-min))
+    (while (re-search-forward "^ *\n" nil t)
+      (replace-match "<p>\n"))
     (widen)
     (when (message-goto-signature)
       (forward-line -1)