[Emacs-diffs] /srv/bzr/emacs/trunk r101663: Fix comments; remove Emacs 21 stuff.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101663
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-28 12:35:18 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mail-source.el
  lisp/gnus/message.el
  lisp/gnus/mm-decode.el
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-28 11:47:12 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-28 12:35:18 +0000
@@ -1,3 +1,11 @@
+2010-09-28  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-gravatar.el (gnus-gravatar-insert): Fix search in case

=== modified file 'lisp/gnus/mail-source.el'
--- a/lisp/gnus/mail-source.el  2010-09-10 00:08:31 +0000
+++ b/lisp/gnus/mail-source.el  2010-09-28 12:35:18 +0000
@@ -993,7 +993,7 @@
     (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

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-09-28 02:13:41 +0000
+++ b/lisp/gnus/message.el      2010-09-28 12:35:18 +0000
@@ -1158,8 +1158,8 @@
                   (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."

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2010-09-26 04:03:19 +0000
+++ b/lisp/gnus/mm-decode.el    2010-09-28 12:35:18 +0000
@@ -1479,7 +1479,7 @@
    ;; 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)))

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-09-26 04:03:19 +0000
+++ b/lisp/gnus/mml2015.el      2010-09-28 12:35:18 +0000
@@ -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