(rmail-mmdf-delim1, rmail-mmdf-delim2): Doc fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd19d2ced475bbde25f99542bfdb1e0be18f6c10..e23476677fbfdc38487ea216be4e7c7e4c78bf3d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2003-01-06  John Paul Wallington  <jpw@shootybangbang.com>
+
+       * mail/rmail.el (rmail-mmdf-delim1, rmail-mmdf-delim2): Doc fixes.
+
 2003-01-05  Richard M. Stallman  <rms@gnu.org>
 
        * isearch.el (isearch-repeat): Error if try to repeat search and
-       there was no previou search.
+       there was no previous search.
 
        * dired.el (dired-recursive-deletes): Fix custom type.
 
@@ -125,7 +129,6 @@
        * emacs-lisp/eldoc.el (eldoc-get-var-docstring): Only return a
        documentation string when `sym' is non-nil.
 
->>>>>>> 1.4686
 2003-01-02  Steven Tamm  <steventamm@mac.com>
 
        * scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7e7c7c9c1e121296ddc68c34e2631d98137ae536..7bf8b6d737115e0212cbb2d493a51e0cb09dd0c2 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -281,9 +281,9 @@ still the current message in the Rmail buffer.")
 ;;  files).
 
 (defvar rmail-mmdf-delim1 "^\001\001\001\001\n"
-  "Regexp marking the start of an mmdf message")
+  "Regexp marking the start of an mmdf message.")
 (defvar rmail-mmdf-delim2 "^\001\001\001\001\n"
-  "Regexp marking the end of an mmdf message")
+  "Regexp marking the end of an mmdf message.")
 
 (defcustom rmail-message-filter nil
   "If non-nil, a filter function for new messages in RMAIL.
@@ -2400,7 +2400,7 @@ If summary buffer is currently displayed, update current message there also."
                        (progn
                          (check-coding-system coding-system)
                          (setq buffer-file-coding-system coding-system))
-                     (error 
+                     (error
                       (setq buffer-file-coding-system nil))))
                (setq buffer-file-coding-system nil)))))
        ;; Clear the "unseen" attribute when we show a message.