# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1285677318 0
# Node ID 6c6f3972c99cb45b5190c906f4983bc126f8ac13
# Parent  05430cec48ffd8c3be178002fd5d62c29c1e8250
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.

diff -r 05430cec48ff -r 6c6f3972c99c lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Sep 28 11:47:12 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue Sep 28 12:35:18 2010 +0000
@@ -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 -r 05430cec48ff -r 6c6f3972c99c lisp/gnus/mail-source.el
--- a/lisp/gnus/mail-source.el	Tue Sep 28 11:47:12 2010 +0000
+++ b/lisp/gnus/mail-source.el	Tue Sep 28 12:35:18 2010 +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
diff -r 05430cec48ff -r 6c6f3972c99c lisp/gnus/message.el
--- a/lisp/gnus/message.el	Tue Sep 28 11:47:12 2010 +0000
+++ b/lisp/gnus/message.el	Tue Sep 28 12:35:18 2010 +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."
diff -r 05430cec48ff -r 6c6f3972c99c lisp/gnus/mm-decode.el
--- a/lisp/gnus/mm-decode.el	Tue Sep 28 11:47:12 2010 +0000
+++ b/lisp/gnus/mm-decode.el	Tue Sep 28 12:35:18 2010 +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)))
diff -r 05430cec48ff -r 6c6f3972c99c lisp/gnus/mml2015.el
--- a/lisp/gnus/mml2015.el	Tue Sep 28 11:47:12 2010 +0000
+++ b/lisp/gnus/mml2015.el	Tue Sep 28 12:35:18 2010 +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