# HG changeset patch # User John Paul Wallington # Date 1041868949 0 # Node ID 336bfea9bad4a421d6cfe2b2a4729928b9ee403f # Parent bd4e0fb1fe782e1680435fa845f35e4770a0ffb1 (rmail-mmdf-delim1, rmail-mmdf-delim2): Doc fixes. diff -r bd4e0fb1fe78 -r 336bfea9bad4 lisp/ChangeLog --- a/lisp/ChangeLog Mon Jan 06 15:41:17 2003 +0000 +++ b/lisp/ChangeLog Mon Jan 06 16:02:29 2003 +0000 @@ -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 -r bd4e0fb1fe78 -r 336bfea9bad4 lisp/mail/rmail.el --- a/lisp/mail/rmail.el Mon Jan 06 15:41:17 2003 +0000 +++ b/lisp/mail/rmail.el Mon Jan 06 16:02:29 2003 +0000 @@ -281,9 +281,9 @@ ;; 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 @@ (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.