# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1248151375 0
# Node ID a909fa4b5bddd6a86e0bdff209b24a595cd25b24
# Parent  f0176ca49d34efa0cc387975a6b43cfeaa8417d1
(rmail-retry-ignored-headers): Bump :version.

diff -r f0176ca49d34 -r a909fa4b5bdd lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 21 04:42:16 2009 +0000
+++ b/lisp/ChangeLog	Tue Jul 21 04:42:55 2009 +0000
@@ -1,3 +1,28 @@
+2009-07-21  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (abort-if-file-too-large): Explicitly pass `filename'
+	as an argument.
+	(find-file-noselect, insert-file-1): Update for above change.
+
+	* mail/rmail.el (rmail-retry-ignored-headers): Bump :version.
+
+	* mail/mailclient.el (mailclient-send-it): Fix message.
+
+	* emacs-lisp/edebug.el (cl-debug-env): Only define for compiler.
+	(edebug-eval): Check cl-debug-env is bound.
+	(print-level, print-circle): Don't redefine built-in variables.
+
+	* emacs-lisp/cust-print.el: Remove leading * from defcustom docs.
+	(custom-print-vectors): Remove old comments from doc.
+
+	* emerge.el (menu-bar-emerge-menu): Remove unused variable.
+	(emerge-version): Make the variable an obsolete alias for the
+	emacs-version variable.  Make the function obsolete.
+	(emerge-fast-keymap, emerge-edit-keymap): Make a separate menu for
+	Emerge options, rather than merging in into the main Options menu.
+	(emerge-options-menu): Adjust menu text.  Use buttons for skip prefers
+	and auto advance modes.  Disable edit/fast items when not relevant.
+
 2009-07-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* term/vt420.el (terminal-init-vt420): Fix typo.
diff -r f0176ca49d34 -r a909fa4b5bdd lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Tue Jul 21 04:42:16 2009 +0000
+++ b/lisp/mail/rmail.el	Tue Jul 21 04:42:55 2009 +0000
@@ -375,7 +375,7 @@
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers
-  :version "23.1")	   ; added content-type/encoding, mime-version
+  :version "23.2")	   ; added x-detected-operating-system, x-spam
 
 ;;;###autoload
 (defcustom rmail-highlighted-headers "^From:\\|^Subject:"