From 3e0b7b44a8ab678c575f840cf1b51376183e42df Mon Sep 17 00:00:00 2001 From: John Paul Wallington Date: Mon, 6 Jan 2003 16:02:29 +0000 Subject: [PATCH] (rmail-mmdf-delim1, rmail-mmdf-delim2): Doc fixes. --- lisp/ChangeLog | 7 +++++-- lisp/mail/rmail.el | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bd19d2ced47..e23476677fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,11 @@ +2003-01-06 John Paul Wallington + + * mail/rmail.el (rmail-mmdf-delim1, rmail-mmdf-delim2): Doc fixes. + 2003-01-05 Richard M. Stallman * 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 * scroll-bar.el (toggle-scroll-bar, scroll-bar-mode): Have diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 7e7c7c9c1e1..7bf8b6d7371 100644 --- 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. -- 2.11.4.GIT