From 32b017d0bf1e0b149a47f851a6305e46d0718e9f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 10 Jan 2001 05:32:48 +0000 Subject: [PATCH] * gnus-vers.el (gnus-revision-number): Increment to 03. * 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 or Emacs 21 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. --- ChangeLog | 17 +++++++++++++++++ lisp/gnus-art.el | 25 ++++++++++++++++--------- lisp/gnus-vers.el | 2 +- lisp/gnus.el | 11 +++++------ 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e45d977..ba55810 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2001-01-10 Katsumi Yamaoka + + * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. + + * 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 or Emacs 21 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. + 2001-01-05 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 02. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index f8e0c4a..355d505 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -211,16 +211,17 @@ 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. +;; gnus-xmas.el overrides this for XEmacs. (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. - ;; gnus-xmas.el overrides this for XEmacs. + ((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 (featurep 'xemacs)) window-system (module-installed-p 'x-face-mule)) @@ -1039,7 +1040,7 @@ See the manual for details." (image-type-available-p 'pbm)) (and (not (featurep 'xemacs)) window-system - (module-installed-p 'gnus-bitmap))) + (module-installed-p 'smiley-mule))) t nil) "Display smileys. @@ -1130,7 +1131,7 @@ It is a string, such as \"PGP\". If nil, ask user." (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-x-pgp-sig gnus-article-verify-x-pgp-sig) (gnus-treat-strip-banner gnus-article-strip-banner) @@ -1167,7 +1168,10 @@ It is a string, such as \"PGP\". If nil, ask user." 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 (or (featurep 'xemacs) + (>= emacs-major-version 21)) + '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))) @@ -5519,6 +5523,9 @@ forbidden in URL encoding." "Activate ADDRESS with `browse-url'." (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 0a4ac35..736d508 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -31,7 +31,7 @@ (require 'product) (provide 'gnus-vers) -(defconst gnus-revision-number "02" +(defconst gnus-revision-number "03" "Revision number for this version of gnus.") ;; Product information of this gnus. diff --git a/lisp/gnus.el b/lisp/gnus.el index 97ac96f..07818b6 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1953,7 +1953,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 @@ -2034,11 +2033,11 @@ 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 (>= emacs-major-version 21) + (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 -- 1.7.10.4