Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3fd93f2..b8671f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2001-02-21 01:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * smiley.el (gnus-smiley-display): Don't do widening.
+
+       * smiley-ems.el (gnus-smiley-display): Don't do widening. Smiley
+       within body.
+
+       * gnus-msg.el (gnus-inews-do-gcc): Activate group anyway.
+
+       * gnus-art.el (gnus-mime-display-multipart-alternative-as-mixed):
+       New.
+       (gnus-mime-display-multipart-related-as-mixed): New.
+       (gnus-mime-display-part): Use them.
+               
 2001-02-20 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-start.el (gnus-setup-news): Allow gnus-group-line-format to be

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 812d0e5..e77d3cd 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4171,6 +4171,8 @@ In no internal viewer is available, use an external viewer."
              (gnus-treat-article 'head))))))))
 
 (defvar gnus-mime-display-multipart-as-mixed nil)
+(defvar gnus-mime-display-multipart-alternative-as-mixed nil)
+(defvar gnus-mime-display-multipart-related-as-mixed nil)
 
 (defun gnus-mime-display-part (handle)
   (cond
@@ -4183,13 +4185,15 @@ In no internal viewer is available, use an external viewer."
             handle))
    ;; multipart/alternative
    ((and (equal (car handle) "multipart/alternative")
-        (not gnus-mime-display-multipart-as-mixed))
+        (not (or gnus-mime-display-multipart-as-mixed
+                 gnus-mime-display-multipart-alternative-as-mixed)))
     (let ((id (1+ (length gnus-article-mime-handle-alist))))
       (push (cons id handle) gnus-article-mime-handle-alist)
       (gnus-mime-display-alternative (cdr handle) nil nil id)))
    ;; multipart/related
    ((and (equal (car handle) "multipart/related")
-        (not gnus-mime-display-multipart-as-mixed))
+        (not (or gnus-mime-display-multipart-as-mixed
+                 gnus-mime-display-multipart-related-as-mixed)))
     ;;;!!!We should find the start part, but we just default
     ;;;!!!to the first part.
     ;;(gnus-mime-display-part (cadr handle))

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 85366c2..f66f7df 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1238,12 +1238,7 @@ this is a reply."
                                group (gnus-status-message method))
                  (sit-for 2))
                (when (and group-art gnus-inews-mark-gcc-as-read)
-                 (let ((active (gnus-active group)))
-                   (if active
-                       (if (< (cdr active) (cdr group-art))
-                           (gnus-set-active group (cons (car active)
-                                                        (cdr group-art))))
-                     (gnus-activate-group group)))
+                 (gnus-activate-group group)
                  (let ((buffer (gnus-summary-buffer-name group))
                        (mark gnus-read-mark)
                        (article (cdr group-art)))

diff --git a/lisp/smiley-ems.el b/lisp/smiley-ems.el
index 6083a65..b27ea19 100644 (file)
--- a/lisp/smiley-ems.el
+++ b/lisp/smiley-ems.el
@@ -145,13 +145,10 @@ With arg, turn displaying on if and only if arg is positive."
 With arg, turn displaying on if and only if arg is positive."
   (interactive "P")
   (save-excursion
-    (set-buffer gnus-article-buffer)
-    (save-restriction
-      (widen)
-      (article-goto-body)
-      (smiley-region (point-min) (point-max))
-      (if (and (numberp arg) (<= arg 0))
-         (smiley-toggle-buffer arg)))))
+    (article-goto-body)
+    (smiley-region (point) (point-max))
+    (if (and (numberp arg) (<= arg 0))
+       (smiley-toggle-buffer arg))))
 
 (provide 'smiley)
 

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 380cea9..f070c71 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -428,12 +428,9 @@ With arg, turn displaying on if and only if arg is positive."
 With arg, turn displaying on if and only if arg is positive."
   (interactive "P")
   (save-excursion
-    (set-buffer gnus-article-buffer)
-    (save-restriction
-      (widen)
-      (article-goto-body)
-      (let (buffer-read-only)
-       (smiley-toggle-buffer arg (current-buffer) (point) (point-max))))))
+    (article-goto-body)
+    (let (buffer-read-only)
+      (smiley-toggle-buffer arg (current-buffer) (point) (point-max)))))
 
 (provide 'smiley)