Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 898b619..4340d0c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2000-11-14 10:32:42  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mailcap.el (mailcap-possible-viewers): Match the entire string.
+
+2000-11-14 10:20:56  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml2015.el (mml2015-mailcrypt-verify): replace-match is
+       incompatible.
+       (mml2015-mailcrypt-sign): Ditto.
+
+2000-11-14 10:12:05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-msg.el (gnus-inews-do-gcc): Update summary data when the
+       group is open.
+
 2000-11-14 00:48:52  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-bcklg.el (gnus-backlog-enter-article): Don't enter

diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index 5317eae..4f5e19c 100644 (file)
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -526,7 +526,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus
       (cond
        ((equal (car (car major)) minor)
        (setq exact (cons (cdr (car major)) exact)))
-       ((and minor (string-match (car (car major)) minor))
+       ((and minor (string-match (concat "^" (car (car major)) "$") minor))
        (setq wildcard (cons (cdr (car major)) wildcard))))
       (setq major (cdr major)))
     (nconc exact wildcard)))

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 7ab899a..9afcc03 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1189,12 +1189,29 @@ this is a reply."
                  (sit-for 2))
                (when (and group-art gnus-inews-mark-gcc-as-read)
                  (let ((active (gnus-active group)))
-                   (when active
-                     (if (< (cdr active) (cdr group-art))
-                         (gnus-set-active group (cons (car active) 
-                                                      (cdr group-art))))
+                   (if active
+                       (if (< (cdr active) (cdr group-art))
+                           (gnus-set-active group (cons (car active) 
+                                                        (cdr group-art))))
+                     (gnus-activate-group group)))
+                 (let ((buffer (concat "*Summary " group "*"))
+                       (mark gnus-read-mark)
+                       (article (cdr group-art)))
+                   (unless 
+                       (and 
+                        (get-buffer buffer)
+                        (with-current-buffer buffer
+                          (when gnus-newsgroup-prepared
+                            (when (and gnus-newsgroup-auto-expire
+                                       (memq mark gnus-auto-expirable-marks))
+                              (setq mark gnus-expirable-mark))
+                            (setq mark (gnus-request-update-mark 
+                                        group article mark))
+                            (gnus-mark-article-as-read article mark)
+                            (setq gnus-newsgroup-active (gnus-active group))
+                            t)))
                      (gnus-group-make-articles-read group 
-                                                    (list (cdr group-art))))))
+                                                    (list article)))))
                (kill-buffer (current-buffer))))))))))
 
 (defun gnus-inews-insert-gcc ()

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index d38bf68..ff72f35 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -168,10 +168,10 @@
          (narrow-to-region (point) (point))
          (mm-insert-part part)
          (goto-char (point-min))
-         (if (re-search-forward "^-----\\([^-]+\\)-----$" nil t)
-             (replace-match "BEGIN PGP SIGNATURE" t t nil 1))
-         (if (re-search-forward "^-----\\([^-]+\\)-----$" nil t)
-             (replace-match "END PGP SIGNATURE" t t nil 1)))
+         (if (re-search-forward "^-----BEGIN PGP [^-]+-----\r?$" nil t)
+             (replace-match "-----BEGIN PGP SIGNATURE-----" t t))
+         (if (re-search-forward "^-----END PGP [^-]+-----\r?$" nil t)
+             (replace-match "-----END PGP SIGNATURE-----" t t)))
        (unless (condition-case err
                    (funcall mml2015-verify-function)
                  (error 
@@ -230,14 +230,14 @@
     (insert (format "\n--%s\n" boundary))
     (setq point (point))
     (goto-char (point-max))
-    (unless (re-search-backward "^-----END PGP \\(SIGNATURE\\)-----\r?$" nil t)
+    (unless (re-search-backward "^-----END PGP SIGNATURE-----\r?$" nil t)
       (error "Cannot find signature part." ))
-    (replace-match "MESSAGE" t t nil 1)
+    (replace-match "-----END PGP MESSAGE-----" t t)
     (goto-char (match-beginning 0))
-    (unless (re-search-backward "^-----BEGIN PGP \\(SIGNATURE\\)-----\r?$" 
+    (unless (re-search-backward "^-----BEGIN PGP SIGNATURE-----\r?$" 
                                nil t)
       (error "Cannot find signature part." ))
-    (replace-match "MESSAGE" t t nil 1)
+    (replace-match "-----BEGIN PGP MESSAGE-----" t t)
     (goto-char (match-beginning 0))
     (save-restriction
       (narrow-to-region point (point))