Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 047f997..ed940f6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2000-10-04 15:24:46  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-article-prepare): Configure windows before
+       gnus-article-prepare-display is called.  Otherwise, BBDB's popup
+       window might be overrided.
+
+2000-10-04  Dave Love  <fx@gnu.org>
+
+       * gnus-ems.el (gnus-article-display-xface)
+       [gnus-article-compface-xbm]: Fix.
+       (gnus-x-splash): Bind width, height.
+
+2000-10-04 11:45:04  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-mime-inline-part): Use prefix argument only
+       when it is called interactively.
+
 2000-10-03 21:20:31  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-art.el (gnus-mime-action-alist): New variable.
@@ -254,8 +271,8 @@
        * mail-source.el (mail-source-imap-file-coding-system): New variable.
        (mail-source-fetch-imap): Use it.
 
-        * rfc2104.el (rfc2104-hexstring-to-bitstring): New function.
-        (rfc2104-hash): Use it.
+       * rfc2104.el (rfc2104-hexstring-to-bitstring): New function.
+       (rfc2104-hash): Use it.
 
        * imap.el (imap-starttls-p): Check for starttls binary.
        (imap-starttls-open): More verbose.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 7bd0c80..c65a62f 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3100,6 +3100,8 @@ If ALL-HEADERS is non-nil, no headers are hidden."
                (gnus-set-global-variables)
                (setq gnus-have-all-headers
                      (or all-headers gnus-show-all-headers))))
+           (save-excursion
+             (gnus-configure-windows 'article))
            (when (or (numberp article)
                      (stringp article))
              (gnus-article-prepare-display)
@@ -3114,7 +3116,6 @@ If ALL-HEADERS is non-nil, no headers are hidden."
              (gnus-set-mode-line 'article))
            (article-goto-body)
            (set-window-point (get-buffer-window (current-buffer)) (point))
-           (gnus-configure-windows 'article)
            t))))))
 
 (defun gnus-article-prepare-mime-display (&optional number)
@@ -3390,9 +3391,9 @@ value of the variable `gnus-show-mime' is non-nil."
       (setq buffer-file-name nil))
     (goto-char (point-min))))
 
-(defun gnus-mime-inline-part (&optional handle)
+(defun gnus-mime-inline-part (&optional handle arg)
   "Insert the MIME part under point into the current buffer."
-  (interactive)
+  (interactive (list nil current-prefix-arg))
   (gnus-article-check-buffer)
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
         contents charset
@@ -3402,13 +3403,13 @@ value of the variable `gnus-show-mime' is non-nil."
        (mm-remove-part handle)
       (setq contents (mm-get-part handle))
       (cond
-       ((not current-prefix-arg)
+       ((not arg)
        (setq charset (or (mail-content-type-get
                           (mm-handle-type handle) 'charset)
                          gnus-newsgroup-charset)))
-       ((numberp current-prefix-arg)
+       ((numberp arg)
        (setq charset
-             (or (cdr (assq current-prefix-arg 
+             (or (cdr (assq arg 
                             gnus-summary-show-article-charset-alist))
                  (read-coding-system "Charset: ")))))
       (forward-line 2)

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 04f63cb..c898bc9 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -174,7 +174,8 @@
        pixmap file height beg i)
     (save-excursion
       (switch-to-buffer (gnus-get-buffer-create gnus-group-buffer))
-      (let ((buffer-read-only nil))
+      (let ((buffer-read-only nil)
+           width height)
        (erase-buffer)
        (when (and dir
                   (file-exists-p (setq file
@@ -246,7 +247,8 @@ for XEmacs."
                              'delete '(t nil) nil
                              (if gnus-article-compface-xbm
                                  '("-X"))))
-                (unless gnus-article-compface-xbm
+                (if gnus-article-compface-xbm
+                    t
                   (goto-char (point-min))
                   (progn (insert "/* Width=48, Height=48 */\n") t)
                   (eq 0 (call-process-region (point-min) (point-max)
@@ -256,11 +258,19 @@ for XEmacs."
                 ;; light on dark.
                 (if (eq 'dark (cdr-safe (assq 'background-mode
                                               (frame-parameters))))
-                    (setq image (create-image (buffer-string) 'pbm t
+                    (setq image (create-image (buffer-string)
+                                              (if gnus-article-compface-xbm
+                                                  'xbm
+                                                'pbm)
+                                              t
                                               :ascent 'center
                                               :foreground "black"
                                               :background "white"))
-                  (setq image (create-image (buffer-string) 'pbm t
+                  (setq image (create-image (buffer-string)
+                                            (if gnus-article-compface-xbm
+                                                'xbm
+                                              'pbm)
+                                            t
                                             :ascent 'center)))))
          (ring-insert gnus-article-xface-ring-internal (cons data image)))
        (when image

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 7f9d787..177d26d 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-04 09:23:49  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi (Article Hiding): Add.
+       (Using MIME): Add.
+
 2000-09-30  Simon Josefsson  <simon@josefsson.org>
 
        * gnus.texi (Agent and IMAP): Add.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 41593e6..a7f7fe2 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -7179,7 +7179,9 @@ the @code{banner} group parameter (@pxref{Group Parameters}) to the
 group you want banners stripped from.  The parameter either be a string,
 which will be interpreted as a regular expression matching text to be
 removed, or the symbol @code{signature}, meaning that the (last)
-signature should be removed.
+signature should be removed, or other symbol, meaning that the
+corresponding regular expression in @code{gnus-article-banner-alist} is
+used.
 
 @item W W c
 @kindex W W c (Summary)