projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
T-gnus 6.14.6; synch up with Gnus v5.8.8.
[elisp/gnus.git-]
/
lisp
/
nndoc.el
diff --git
a/lisp/nndoc.el
b/lisp/nndoc.el
index
363ff3c
..
3833395
100644
(file)
--- a/
lisp/nndoc.el
+++ b/
lisp/nndoc.el
@@
-71,8
+71,8
@@
from the document.")
(body-begin-function . nndoc-babyl-body-begin)
(head-begin-function . nndoc-babyl-head-begin))
(forward
(body-begin-function . nndoc-babyl-body-begin)
(head-begin-function . nndoc-babyl-head-begin))
(forward
- (article-begin . "^-+ \\(Start of \\)?forwarded message -+\n+")
- (body-end . "^-+ End \\(of \\)?forwarded message -+$")
+ (article-begin . "^-+ \\(Start of \\)?forwarded message.*\n+")
+ (body-end . "^-+ End \\(of \\)?forwarded message.*$")
(prepare-body-function . nndoc-unquote-dashes))
(rfc934
(article-begin . "^--.*\n+")
(prepare-body-function . nndoc-unquote-dashes))
(rfc934
(article-begin . "^--.*\n+")
@@
-87,6
+87,7
@@
from the document.")
(article-transform-function . nndoc-transform-clari-briefs))
(mime-digest
(article-begin . "")
(article-transform-function . nndoc-transform-clari-briefs))
(mime-digest
(article-begin . "")
+ (head-begin . "^ ?\n")
(head-end . "^ ?$")
(body-end . "")
(file-end . "")
(head-end . "^ ?$")
(body-end . "")
(file-end . "")
@@
-124,6
+125,9
@@
from the document.")
(rfc822-forward
(article-begin . "^\n")
(body-end-function . nndoc-rfc822-forward-body-end-function))
(rfc822-forward
(article-begin . "^\n")
(body-end-function . nndoc-rfc822-forward-body-end-function))
+ (outlook
+ (article-begin-function . nndoc-outlook-article-begin)
+ (body-end . "\0"))
(guess
(guess . t)
(subtype nil))
(guess
(guess . t)
(subtype nil))
@@
-432,7
+436,8
@@
from the document.")
t))
(defun nndoc-forward-type-p ()
t))
(defun nndoc-forward-type-p ()
- (when (and (re-search-forward "^-+ Start of forwarded message -+\n+" nil t)
+ (when (and (re-search-forward "^-+ \\(Start of \\)?forwarded message.*\n+"
+ nil t)
(not (re-search-forward "^Subject:.*digest" nil t))
(not (re-search-backward "^From:" nil t 2))
(not (re-search-forward "^From:" nil t 2)))
(not (re-search-forward "^Subject:.*digest" nil t))
(not (re-search-backward "^From:" nil t 2))
(not (re-search-forward "^From:" nil t 2)))
@@
-526,10
+531,11
@@
from the document.")
nil t)
(match-beginning 1))
(setq boundary-id (match-string 1)
nil t)
(match-beginning 1))
(setq boundary-id (match-string 1)
- b-delimiter (concat "\n--" boundary-id "[\n \t]+"))
+ b-delimiter (concat "\n--" boundary-id "[ \t]*$"))
(setq entry (assq 'mime-digest nndoc-type-alist))
(setcdr entry
(list
(setq entry (assq 'mime-digest nndoc-type-alist))
(setcdr entry
(list
+ (cons 'head-begin "^ ?\n")
(cons 'head-end "^ ?$")
(cons 'body-begin "^ ?\n")
(cons 'article-begin b-delimiter)
(cons 'head-end "^ ?$")
(cons 'body-begin "^ ?\n")
(cons 'article-begin b-delimiter)
@@
-586,6
+592,14
@@
from the document.")
(when (looking-at "From - ")
t))
(when (looking-at "From - ")
t))
+(defun nndoc-outlook-article-begin ()
+ (prog1 (re-search-forward "From:\\|Received:" nil t)
+ (goto-char (match-beginning 0))))
+
+(defun nndoc-outlook-type-p ()
+ ;; FIXME: Is JMF the magic of outlook mailbox? -- ShengHuo.
+ (looking-at "JMF"))
+
(deffoo nndoc-request-accept-article (group &optional server last)
nil)
(deffoo nndoc-request-accept-article (group &optional server last)
nil)
@@
-687,7
+701,8
@@
PARENT is the message-ID of the parent summary line, or nil for none."
subject content-type type subtype boundary-regexp)
;; Gracefully handle a missing body.
(goto-char head-begin)
subject content-type type subtype boundary-regexp)
;; Gracefully handle a missing body.
(goto-char head-begin)
- (if (search-forward "\n\n" body-end t)
+ (if (or (and (eq (char-after) ?\n) (or (forward-char 1) t))
+ (search-forward "\n\n" body-end t))
(setq head-end (1- (point))
body-begin (point))
(setq head-end body-end
(setq head-end (1- (point))
body-begin (point))
(setq head-end body-end
@@
-769,7
+784,7
@@
PARENT is the message-ID of the parent summary line, or nil for none."
(let ((part-counter 0)
part-begin part-end eof-flag)
(while (string-match "\
(let ((part-counter 0)
part-begin part-end eof-flag)
(while (string-match "\
-^\\(Lines\\|Content-\\(Type\\|Transfer-Encoding\\)\\):.*\n\\([ \t].*\n\\)*"
+^\\(Lines\\|Content-\\(Type\\|Transfer-Encoding\\|Disposition\\)\\):.*\n\\([ \t].*\n\\)*"
article-insert)
(setq article-insert (replace-match "" t t article-insert)))
(let ((case-fold-search nil))
article-insert)
(setq article-insert (replace-match "" t t article-insert)))
(let ((case-fold-search nil))