* gnus-vers.el (gnus-revision-number): Increment to 09.

* gnus.el: Don't autoload "smiley" for `smiley-toggle-buffer';
 don't autoload "gnus-bitmap" or "x-face-mule" when Emacs 21 is running.

* gnus-art.el (TopLevel): Autoload "gnus-bitmap" for `smiley-toggle-buffer'
 when compiling.
(gnus-treatment-function-alist): Use `gnus-smiley-display' for
 `gnus-treat-display-smileys' by default when XEmacs is running.
(gnus-treat-display-smileys): Check for `smiley-mule' instead of `gnus-bitmap'.
(gnus-article-x-face-command): Don't check for xbm for x-face-e21.

diff --git a/ChangeLog b/ChangeLog
index 04872eb..0c3ae90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-01-10  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/gnus-vers.el (gnus-revision-number): Increment to 09.
+
+       * lisp/gnus.el: Don't autoload "smiley" for `smiley-toggle-buffer';
+       don't autoload "gnus-bitmap" or "x-face-mule" when Emacs 21 is
+       running.
+
+       * lisp/gnus-art.el (TopLevel): Autoload "gnus-bitmap" for
+       `smiley-toggle-buffer' when compiling.
+       (gnus-treatment-function-alist): Use `gnus-smiley-display' for
+       `gnus-treat-display-smileys' by default when XEmacs is running.
+       (gnus-treat-display-smileys): Check for `smiley-mule' instead of
+       `gnus-bitmap'.
+       (gnus-article-x-face-command): Don't check for xbm for x-face-e21.
+
 2000-12-06  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/nnshimbun.el (TopLevel): Defalias `coding-system-category'

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 288e8cd..6f4fde5 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -208,15 +208,16 @@ regexp.  If it matches, the text in question is not a signature."
   :type 'sexp
   :group 'gnus-article-hiding)
 
+;; Fixme: This isn't the right thing for mixed graphical and and
+;; non-graphical frames in a session.
 (defcustom gnus-article-x-face-command
   (cond
-   ;; Fixme: This isn't the right thing for mixed graphical and and
-   ;; non-graphical frames in a session.
+   ((and (fboundp 'image-type-available-p)
+        (module-installed-p 'x-face-e21))
+    'x-face-decode-message-header)
    ((and (fboundp 'image-type-available-p)
         (image-type-available-p 'xbm))
-    (if (module-installed-p 'x-face-e21)
-       'x-face-decode-message-header
-      'gnus-article-display-xface))
+    'gnus-article-display-xface)
    ((and (not gnus-xemacs)
         window-system
         (module-installed-p 'x-face-mule))
@@ -925,7 +926,7 @@ See the manual for details."
   (if (or (and gnus-xemacs (featurep 'xpm))
          (and (not gnus-xemacs)
               window-system
-              (module-installed-p 'gnus-bitmap)))
+              (module-installed-p 'smiley-mule)))
       t
     nil)
   "Display smileys.
@@ -989,7 +990,7 @@ See the manual for details."
 
 (defvar gnus-article-mime-handle-alist-1 nil)
 (defvar gnus-treatment-function-alist
-  '((gnus-treat-decode-article-as-default-mime-charset
+  `((gnus-treat-decode-article-as-default-mime-charset
      gnus-article-decode-article-as-default-mime-charset)
     (gnus-treat-strip-banner gnus-article-strip-banner)
     (gnus-treat-strip-headers-in-body gnus-article-strip-headers-in-body)
@@ -1023,7 +1024,9 @@ See the manual for details."
      gnus-article-strip-multiple-blank-lines)
     (gnus-treat-overstrike gnus-article-treat-overstrike)
     (gnus-treat-buttonize-head gnus-article-add-buttons-to-head)
-    (gnus-treat-display-smileys gnus-article-smiley-display)
+    (gnus-treat-display-smileys ,(if (featurep 'xemacs)
+                                    'gnus-smiley-display
+                                  'gnus-article-smiley-display))
     (gnus-treat-capitalize-sentences gnus-article-capitalize-sentences)
     (gnus-treat-display-picons gnus-article-display-picons)
     (gnus-treat-play-sounds gnus-earcon-display)))
@@ -5037,6 +5040,9 @@ forbidden in URL encoding."
   "Browse ADDRESS."
   (browse-url (gnus-strip-whitespace address)))
 
+(eval-when-compile
+  ;; Silence the byte-compiler.
+  (autoload 'smiley-toggle-buffer "gnus-bitmap"))
 (defun gnus-article-smiley-display ()
   "Display \"smileys\" as small graphical icons."
   (smiley-toggle-buffer 1 (current-buffer) (point-min) (point-max)))

diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index 95456e5..77ce182 100644 (file)
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "08"
+(defconst gnus-revision-number "09"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index bfa7a98..e52aef8 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1806,7 +1806,6 @@ use the article treating faculties instead.  Is is described in Info node
      ("gnus-gl" bbb-login bbb-logout bbb-grouplens-group-p
       gnus-grouplens-mode)
      ("smiley" :interactive t gnus-smiley-display)
-     ("smiley" smiley-toggle-buffer)
      ("gnus-win" gnus-configure-windows gnus-add-configuration)
      ("gnus-sum" gnus-summary-insert-line gnus-summary-read-group
       gnus-list-of-unread-articles gnus-list-of-read-articles
@@ -1887,11 +1886,31 @@ use the article treating faculties instead.  Is is described in Info node
 
 (eval-and-compile
   (unless (featurep 'xemacs)
-    (autoload 'gnus-smiley-display "gnus-bitmap" nil t)
-    (autoload 'smiley-toggle-buffer "gnus-bitmap")
-    (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule")
-    (when (>= emacs-major-version 21)
-      (autoload 'x-face-decode-message-header "x-face-e21"))))
+    (if (and (fboundp 'image-type-available-p)
+            (module-installed-p 'x-face-e21))
+       (progn
+         ;; Don't load gnus-bitmap, it will destroy x-face-e21 thingies.
+         (autoload 'smiley-toggle-buffer "smiley-mule")
+         (defun gnus-smiley-display (&optional arg)
+           "Display \"smileys\" as small graphical icons.
+With arg, turn displaying on if and only if arg is positive."
+           (interactive "P")
+           (if window-system
+               (save-excursion
+                 (set-buffer gnus-article-buffer)
+                 (save-restriction
+                   (widen)
+                   (article-goto-body)
+                   (narrow-to-region (point) (point-max))
+                   (let ((inhibit-read-only t)
+                         buffer-read-only)
+                     (smiley-toggle-buffer arg))))
+             (when (interactive-p)
+               (message "You're not under window system."))))
+         (autoload 'x-face-decode-message-header "x-face-e21"))
+      (autoload 'gnus-smiley-display "gnus-bitmap" nil t)
+      (autoload 'smiley-toggle-buffer "gnus-bitmap")
+      (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule"))))
 
 ;;; gnus-sum.el thingies