* gnus.texi (Posting Styles): Addition.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ab440f..37fd8f9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2000-12-28 19:44:56  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnheaderxm.el (nnheader-string-as-multibyte): New alias.
+
+       * nnheader.el (nnheader-string-as-multibyte): New alias.
+
+       * mm-view.el (mm-inline-text): Warn when bugging out in w3. 
+
        * gnus-uu.el (gnus-message-process-mark): New function.
        (gnus-uu-mark-by-regexp): Use it.
        (gnus-new-processable): New function.

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index beeac96..c08b029 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -49,8 +49,7 @@
 
 (if (featurep 'xemacs)
     (autoload 'gnus-smiley-display "smiley")
-  (autoload 'gnus-smiley-display "smiley-ems") ; override XEmacs version
-)
+  (autoload 'gnus-smiley-display "smiley-ems")) ; override XEmacs version
 
 (defun gnus-kill-all-overlays ()
   "Delete all overlays in the current buffer."

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 4fa85ef..fc0d383 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -37,6 +37,7 @@
 (require 'gnus-win)
 (require 'gnus-undo)
 (require 'time-date)
+(require 'gnus-ems)
 
 (defcustom gnus-group-archive-directory
   "*ftp@ftp.hpc.uh.edu:/pub/emacs/ding-list/"

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index c6ddb5b..92cd168 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -1776,7 +1776,7 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
            (put-text-property (1- (point)) (point) 'articles alike))
          (setq alike (list art)
                last this)))
-      (when last ; Bwadr, duplicate code.
+      (when last                       ; Bwadr, duplicate code.
        (insert last ?\n)
        (put-text-property (1- (point)) (point) 'articles alike))
 
@@ -1785,7 +1785,7 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
        (setq alist (car scores)
              scores (cdr scores)
              entries (assoc header alist))
-       (while (cdr entries) ;First entry is the header index.
+       (while (cdr entries)            ;First entry is the header index.
          (let* ((rest (cdr entries))
                 (kill (car rest))
                 (match (nth 0 kill))

diff --git a/lisp/message.el b/lisp/message.el
index ff45555..3db7427 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1285,7 +1285,7 @@ Return the number of headers removed."
   (goto-char (point-min)))
 
 (defun message-narrow-to-head-1 ()
-  "Like `message-narrow-to-head'. Don't widen."
+  "Like `message-narrow-to-head'.  Don't widen."
   (narrow-to-region
    (goto-char (point-min))
    (if (search-forward "\n\n" nil 1)
@@ -3957,20 +3957,21 @@ responses here are directed to other addresses.")))
       ;; Allow customizations to have their say.
       (if (not wide)
          ;; This is a regular reply.
-         (if (message-functionp message-reply-to-function)
-             (setq follow-to (funcall message-reply-to-function)))
-       ;; This is a followup.
-       (if (message-functionp message-wide-reply-to-function)
+         (when (message-functionp message-reply-to-function)
            (save-excursion
-             (setq follow-to
-                   (funcall message-wide-reply-to-function)))))
+             (setq follow-to (funcall message-reply-to-function))))
+       ;; This is a followup.
+       (when (message-functionp message-wide-reply-to-function)
+         (save-excursion
+           (setq follow-to
+                 (funcall message-wide-reply-to-function)))))
       (setq message-id (message-fetch-field "message-id" t)
            references (message-fetch-field "references")
            date (message-fetch-field "date")
            from (message-fetch-field "from")
            subject (or (message-fetch-field "subject") "none"))
-    (if gnus-list-identifiers
-       (setq subject (message-strip-list-identifiers subject)))
+    (when gnus-list-identifiers
+      (setq subject (message-strip-list-identifiers subject)))
     (setq subject (concat "Re: " (message-strip-subject-re subject)))
 
     (when (and (setq gnus-warning (message-fetch-field "gnus-warning"))

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index d55eb79..d2a67a0 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -119,7 +119,9 @@
                      (url-standalone-mode t))
                  (condition-case var
                      (w3-region (point-min) (point-max))
-                   (error)))))
+                   (error
+                    (message
+                     "Error while rendering html; showing as text/plain"))))))
            (mm-handle-set-undisplayer
             handle
             `(lambda ()

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 1ea1f32..f07b192 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -898,6 +898,7 @@ find-file-hooks, etc.
 (defalias 'nnheader-run-at-time 'run-at-time)
 (defalias 'nnheader-cancel-timer 'cancel-timer)
 (defalias 'nnheader-cancel-function-timers 'cancel-function-timers)
+(defalias 'nnheader-string-as-multibyte 'string-as-multibyte)
 
 (when (featurep 'xemacs)
   (require 'nnheaderxm))

diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el
index 8c1522f..663e4b6 100644 (file)
--- a/lisp/nnheaderxm.el
+++ b/lisp/nnheaderxm.el
@@ -35,6 +35,7 @@
 (defalias 'nnheader-run-at-time 'nnheader-xmas-run-at-time)
 (defalias 'nnheader-cancel-timer 'delete-itimer)
 (defalias 'nnheader-cancel-function-timers 'ignore)
+(defalias 'nnheader-string-as-multibyte 'identity)
 
 (provide 'nnheaderxm)
 

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 716bc0f..0233c94 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -689,7 +689,7 @@ and `altavista'.")
 (defun nnweb-insert-html (parse)
   "Insert HTML based on a w3 parse tree."
   (if (stringp parse)
-      (insert parse)
+      (insert (nnheader-string-as-multibyte parse))
     (insert "<" (symbol-name (car parse)) " ")
     (insert (mapconcat
             (lambda (param)