diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-11-02 05:16:58 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-11-02 05:16:58 +0000 |
| commit | 03c081a88faf2d070779940abeb4133b40d7d03f (patch) | |
| tree | bb8f0546a14571cac6162829c2f2d91d36f37a85 /lisp/mail/undigest.el | |
| parent | c55224684cc0d9a499112f9994ec4bd02d11207a (diff) | |
| download | emacs-03c081a88faf2d070779940abeb4133b40d7d03f.tar.gz | |
(rmail-digest-end-regexps): Simplify.
(undigestify-rmail-message): Fix paren-bug and simplify.
Diffstat (limited to 'lisp/mail/undigest.el')
| -rw-r--r-- | lisp/mail/undigest.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el index 365c040e2da..619c906a8b5 100644 --- a/lisp/mail/undigest.el +++ b/lisp/mail/undigest.el @@ -31,11 +31,7 @@ (require 'rmail) (defcustom rmail-digest-end-regexps - (list (concat "End of.*Digest.*\n" - (regexp-quote "*********") "*" - "\\(\n------*\\)*") - (concat "End of.*\n" - (regexp-quote "*") "*")) + (list "End of.*Digest.*\n" "End of.*\n") "*Regexps matching the end of a digest message." :group 'rmail :type '(repeat regexp)) @@ -86,13 +82,11 @@ Leaves original message, deleted, before the undigestified messages." (regexps rmail-digest-end-regexps)) (while (and regexps (not found)) (goto-char (point-max)) - (skip-chars-backward " \t\n") ;; compensate for broken un*x digestifiers. Sigh Sigh. - (while (and (> (point) start) (not found)) - (forward-line -1) - (if (looking-at (car regexps)) - (setq found t)) - (setq regexps (cdr regexps)))) + (setq found (re-search-backward + (concat "^\\(?:" (car regexps) "\\)") + start t)) + (setq regexps (cdr regexps))) (unless found (error "Message is not a digest--no end line")))) (re-search-forward (concat "^" (make-string 55 ?-) "-*\n*")) |