(rmail-retry-ignored-headers): Bump :version.

2 files changed, 26 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f55e466c258..85d4a348209 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ac7cbc043c4..3766b8d4be9 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -375,7 +375,7 @@ If nil, display all header fields except those matched by
   "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:"