(rmail-unix-mail-delimiter): Doc fix.

(rmail-enable-multibyte): Don't really define, only for compiler.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2e2a17ea53e29776e7ad020c35f648373bba52e..443db51c89713552356e82d3e0ddd3ac7bfff6c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-02-12  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmailsum.el (rmail-get-summary-labels): Store any message labels
+       for use in completion.
+       * mail/rmailkwd.el (rmail-read-label): Don't scan for labels if the
+       summary exists, since it's already done.
+
+       * mail/rmail.el (rmail-unix-mail-delimiter): Doc fix.
+       (rmail-enable-multibyte): Don't really define, only for compiler.
+
 2009-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * files.el (read-buffer-to-switch):

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a9899ee99e726cad77b3e343ce047cee390a24aa..537c404f5134db076a757422ba2c2c1a4f218e3e 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -741,7 +741,7 @@ The first parenthesized expression should match the MIME-charset name.")
      "\n"))
   "Regexp matching the delimiter of messages in UNIX mail format
 \(UNIX From lines), minus the initial ^.  Note that if you change
-this expression, you must change the code in rmail-nuke-pinhead-header
+this expression, you must change the code in `rmail-nuke-pinhead-header'
 that knows the exact ordering of the \\( \\) subexpressions.")
 
 (defvar rmail-font-lock-keywords
@@ -794,12 +794,6 @@ that knows the exact ordering of the \\( \\) subexpressions.")
 \f
 ;;;; *** Rmail Mode ***
 
-;; This variable is dynamically bound.  The defvar is here to placate
-;; the byte compiler.
-
-(defvar rmail-enable-multibyte nil)
-
-
 (defun rmail-require-mime-maybe ()
   "Require `rmail-mime-feature' if that is non-nil.
 Signal an error and set `rmail-mime-feature' to nil if the feature
@@ -1175,6 +1169,8 @@ The buffer is expected to be narrowed to just the header of the message."
 (defun rmail-mode-kill-summary ()
   (if rmail-summary-buffer (kill-buffer rmail-summary-buffer)))
 
+(defvar rmail-enable-multibyte)         ; dynamically bound
+
 ;;;###autoload
 (defun rmail-mode ()
   "Rmail Mode is used by \\<rmail-mode-map>\\[rmail] for editing Rmail files.