diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-28 12:35:18 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-28 12:35:18 +0000 |
| commit | 5b5dafd2cb164810a458c3ce52dce099ecbf8546 (patch) | |
| tree | edaa30902481ce3a20c56552da1292c4819aa25a /lisp/gnus | |
| parent | b6fda8fc58840bab97ef1cb0fce3c26908edb815 (diff) | |
| download | emacs-5b5dafd2cb164810a458c3ce52dce099ecbf8546.tar.gz | |
Fix comments; remove Emacs 21 stuff.
mail-source.el (mail-source-report-new-mail)
message.el (message-default-mail-headers)
mm-decode.el (mm-valid-image-format-p): Comment fix.
mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/mail-source.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 6 |
5 files changed, 13 insertions, 9 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 830f481e8f7..0be5caee803 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org> + + * mail-source.el (mail-source-report-new-mail) + * message.el (message-default-mail-headers) + * mm-decode.el (mm-valid-image-format-p): Comment fix. + + * mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit. + 2010-09-28 Julien Danjou <julien@danjou.info> * gnus-gravatar.el (gnus-gravatar-insert): Fix search in case diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 662b999c288..648ca29b87f 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -993,7 +993,7 @@ This only works when `display-time' is enabled." (if on (progn (require 'time) - ;; display-time-mail-function is an Emacs 21 feature. + ;; display-time-mail-function is an Emacs feature. (setq display-time-mail-function #'mail-source-new-mail-p) ;; Set up the main timer. (setq mail-source-report-new-mail-timer diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index a24725b8cbf..b0738f74b6d 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1158,8 +1158,8 @@ these lines." (stringp mail-archive-file-name)) (format "FCC: %s\n" mail-archive-file-name)) ;; Use the value of `mail-default-headers' if available. - ;; Note: as for Emacs 21, XEmacs 21.4 and 21.5, it is - ;; unavailable unless sendmail.el is loaded. + ;; Note: as for XEmacs 21.4 and 21.5, it is unavailable + ;; unless sendmail.el is loaded. (if (boundp 'mail-default-headers) mail-default-headers)) "*A string of header lines to be inserted in outgoing mails." diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index f773c2fea68..9b756edae40 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1479,7 +1479,7 @@ be determined." ;; Handle XEmacs ((fboundp 'valid-image-instantiator-format-p) (valid-image-instantiator-format-p format)) - ;; Handle Emacs 21 + ;; Handle Emacs ((fboundp 'image-type-available-p) (and (display-graphic-p) (image-type-available-p format))) diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 391517f38ba..675cafe3ac1 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -56,11 +56,7 @@ 'epg) (error)) (progn - (ignore-errors - ;; Avoid the "Recursive load suspected" error - ;; in Emacs 21.1. - (let ((recursive-load-depth-limit 100)) - (require 'pgg))) + (ignore-errors (require 'pgg)) (and (fboundp 'pgg-sign-region) 'pgg)) (progn (ignore-errors |