Coment fixes; 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e74c6be..bb8269a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/mail-source.el b/lisp/mail-source.el
index 662b999..648ca29 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/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/message.el b/lisp/message.el
index 67a7903..e30fe16 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1202,8 +1202,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/mm-decode.el b/lisp/mm-decode.el
index f773c2f..9b756ed 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/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/mml2015.el b/lisp/mml2015.el
index 391517f..675cafe 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/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