From a539ef5f22a99ad8e8e04ffabb8b97507cb730de Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 7 Jan 2004 07:49:23 +0000 Subject: [PATCH] * gnus-art.el (gnus-treat-smiley): Ignore Emacs version number. * gnus-cite.el (gnus-cite-add-face): Don't support old Emacsen. * gnus.el: Always autoload `x-face-decode-message-header' and `x-face-mule-gnus-article-display-x-face'. * pop3.el (pop3-md5): Always use the built-in `md5'. --- ChangeLog | 13 +++++++++++++ lisp/gnus-art.el | 8 +++----- lisp/gnus-cite.el | 7 +------ lisp/gnus.el | 5 ++--- lisp/pop3.el | 26 ++++---------------------- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c47657..6c922ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-01-07 Katsumi Yamaoka + + * lisp/gnus-art.el (gnus-treat-smiley): Ignore Emacs version + number. + + * lisp/gnus-cite.el (gnus-cite-add-face): Don't support old + Emacsen. + + * lisp/gnus.el: Always autoload `x-face-decode-message-header' and + `x-face-mule-gnus-article-display-x-face'. + + * lisp/pop3.el (pop3-md5): Always use the built-in `md5'. + 2004-01-07 Hiroshi Fujishima * etc/gnus-tut.txt: `G m' instead of `G V' (tiny patch). diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 4765444..e095ef5 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1259,10 +1259,9 @@ See Info node `(gnus)Customizing Articles' and Info node (not (or (featurep 'xemacs) (gnus-image-type-available-p 'xpm) (gnus-image-type-available-p 'pbm))) - "If non-nil, gnus uses `smiley-mule' for displaying smileys rather than -`smiley'. It defaults to t when Emacs 20 or earlier is running. + "Non-nil means use `smiley-mule' to show smileys rather than `smiley'. `smiley-mule' is boundled in BITMAP-MULE package. You can set it to t -even if you are using Emacs 21+. It has no effect on XEmacs." +even if your Emacs supports images. It has no effect on XEmacs." :group 'gnus-article-various :type 'boolean :get (lambda (symbol) @@ -2052,8 +2051,7 @@ unfolded." "Toggle display of textual emoticons (\"smileys\") as small graphical icons." (interactive) (unless (featurep 'xemacs) - (when (and (>= emacs-major-version 21) - (not gnus-article-should-use-smiley-mule) + (when (and (not gnus-article-should-use-smiley-mule) gnus-article-smiley-mule-loaded-p) (load "smiley" nil t) (setq gnus-article-smiley-mule-loaded-p nil)) diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index 22b848d..8b13415 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -979,12 +979,7 @@ See also the documentation for `gnus-article-highlight-citation'." from to overlay) (goto-char (point-min)) (when (zerop (forward-line (1- number))) - (static-if (or (featurep 'xemacs) - (and (eq emacs-major-version 20) - (>= emacs-minor-version 3)) - (>= emacs-major-version 21)) - (forward-char (length prefix)) - (move-to-column (string-width prefix))) + (forward-char (length prefix)) (skip-chars-forward " \t") (setq from (point)) (end-of-line 1) diff --git a/lisp/gnus.el b/lisp/gnus.el index d9576bc..94f5eb4 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -2823,9 +2823,8 @@ gnus-registry.el will populate this if it's loaded.") (eval-and-compile (unless (featurep 'xemacs) - (if (>= emacs-major-version 21) - (autoload 'x-face-decode-message-header "x-face-e21") - (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule")))) + (autoload 'x-face-decode-message-header "x-face-e21") + (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule"))) (unless (and (fboundp 'base64-encode-string) (subrp (symbol-function 'base64-encode-string))) diff --git a/lisp/pop3.el b/lisp/pop3.el index c47a2e4..ef87289 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -526,29 +526,11 @@ If NOW, use that time instead." coding-system noerror))) byte-compile-function-environment)))))) -;; Note that `pop3-md5' should never encode a given string to use for -;; the apop authentication. +;; Note that `pop3-md5' should never encode a given string to use for the +;; apop authentication, so we should specify the `binary' coding system. (eval-and-compile - (if (fboundp 'md5) - (if (condition-case nil - (md5 "\ -Check whether the 4th argument CODING-SYSTEM is allowed" - nil nil 'binary) - (error nil)) - ;; Emacs 21 or XEmacs 21 - ;; (md5 OBJECT &optional START END CODING-SYSTEM NOERROR) - (defun pop3-md5 (string) - (md5 string nil nil 'binary)) - ;; The reason why the program reaches here: - ;; 1. XEmacs 20 is running and the built-in `md5' doesn't - ;; allow the 4th argument. - ;; 2. `md5' has been defined by one of some lisp libraries. - ;; 3. This file is being compiled in the Gnus source tree, - ;; and `md5' has been defined in lpath.el. - (defalias 'pop3-md5 'md5)) - ;; The lisp function will be provided by FLIM or other libraries. - (autoload 'md5 "md5") - (defalias 'pop3-md5 'md5))) + (defalias 'pop3-md5 (lambda (string) + (md5 string nil nil 'binary)))) (defun pop3-apop (process user) "Send alternate authentication information to the server." -- 1.7.10.4