2 files changed, 29 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d39cc70a07..3e43dfb74c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
+2009-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailsort.el: Just require rmail.
+
+        * mail/rmailedit.el: Just require rmail.
+        (rmail-old-pruned): Add doc string.
+        (rmail-edit-current-message): Use rmail-msg-is-pruned.
+        (rmail-cease-edit): Don't mangle the leading From line.
+        Don't mark as edited if there were no changes.  (Bug#2256)
+        Correctly restore header state.
+
+        * mail/rmail.el (rmail-automatic-folder-directives): Doc fix.
+        (rmail-current-message, rmail-total-messages)
+        (rmail-message-vector, rmail-deleted-vector): Add doc strings.
+        (rmail-duplicate-message): Doc fix.
+        (rmail-get-header-1, rmail-set-header-1, rmail-set-attribute-1):
+        New functions.
+        (rmail-get-header, rmail-set-header, rmail-set-attribute):
+        Use rmail-apply-in-message.
+        (rmail-message-attr-p): Use rmail-get-header, hence no longer requires
+        unswapped-ness.
+        (rmail-get-attr-names): Check for missing or corrupt attribute headers.
+        (rmail-auto-file): Set the filed attribute, rather than explicitly not
+        doing so.  (Bug#2231)
+
 2009-02-09  Ulf Jasper  <ulf.jasper@web.de>
 
         * net/newst-treeview.el (newsticker-treeview-save)
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index e5b9da3ea6d..e53bcdfa8a2 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -26,14 +26,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'mail-utils)
-  (require 'sort)
-  (require 'rmail))
-
-(autoload 'timezone-make-date-sortable "timezone")
-
-(declare-function rmail-update-summary "rmailsum" (&rest ignore))
+(require 'rmail)
 
 ;; Sorting messages in Rmail buffer
 
@@ -153,6 +146,7 @@ KEYWORDS is a comma-separated list of labels."
                               n))))))
 
 ;; Basic functions
+(declare-function rmail-update-summary "rmailsum" (&rest ignore))
 
 (defun rmail-sort-messages (reverse keyfun)
   "Sort messages of current Rmail file.
@@ -228,6 +222,8 @@ If 1st argument REVERSE is non-nil, sort them in reverse order.
         (if (rmail-summary-exists)
             (rmail-select-summary (rmail-update-summary)))))))
 
+(autoload 'timezone-make-date-sortable "timezone")
+
 (defun rmail-make-date-sortable (date)
   "Make DATE sortable using the function string-lessp."
   ;; Assume the default time zone is GMT.