aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-08-15 03:09:52 +0000
committerGlenn Morris2007-08-15 03:09:52 +0000
commitef831bd0dc9c8567a4f4907cf26b9887bc9f6be1 (patch)
treeb7bfb93b96d710394abfbc6516b738768dc52771
parent1502ed91e1c725e4c7d9a25a3282ebe814aba556 (diff)
downloademacs-ef831bd0dc9c8567a4f4907cf26b9887bc9f6be1.tar.gz
emacs-ef831bd0dc9c8567a4f4907cf26b9887bc9f6be1.zip
(rmail-digest-parse-rfc1153sloppy): Be even sloppier, for the sake of
GNU Mailman. (rmail-digest-rfc1153): Initialize `result' correctly.
-rw-r--r--lisp/mail/undigest.el12
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 5b01f711176..5d6f266b3b0 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -93,7 +93,15 @@ See rmail-digest-methods."
93 (rmail-digest-rfc1153 93 (rmail-digest-rfc1153
94 "^-\\{55,\\}\n\n" 94 "^-\\{55,\\}\n\n"
95 "^\n-\\{27,\\}\n\n" 95 "^\n-\\{27,\\}\n\n"
96 "^\n-\\{27,\\}\n\nEnd of")) 96 ;; GNU Mailman knowingly (see comment at line 353 of ToDigest.py in
97 ;; Mailman source) produces non-conformant rfc 1153 digests, in that
98 ;; the trailer contains a "digest footer" like this:
99 ;; _______________________________________________
100 ;; <one or more lines of list blurb>
101 ;;
102 ;; End of Foo Digest...
103 ;; **************************************
104 "^\nEnd of"))
97 105
98(defun rmail-digest-rfc1153 (prolog-sep message-sep trailer-sep) 106(defun rmail-digest-rfc1153 (prolog-sep message-sep trailer-sep)
99 (goto-char (point-min)) 107 (goto-char (point-min))
@@ -104,7 +112,7 @@ See rmail-digest-methods."
104 separator result) 112 separator result)
105 (move-marker start (match-beginning 0)) 113 (move-marker start (match-beginning 0))
106 (move-marker end (match-end 0)) 114 (move-marker end (match-end 0))
107 (setq result (cons (copy-marker start) (copy-marker end t))) 115 (setq result (list (cons (copy-marker start) (copy-marker end t))))
108 (when (re-search-forward message-sep nil t) 116 (when (re-search-forward message-sep nil t)
109 ;; Ok, at least one message separator found 117 ;; Ok, at least one message separator found
110 (setq separator (match-string 0)) 118 (setq separator (match-string 0))