X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnndoc.el;h=8124262272fd0344243461876aa30aaaccb7e6c8;hb=f9c8170d647a9e61dd1d8bb7c4f7d4d8c6721280;hp=0fe68e4e635aa5be02b72d48e6a5d408a5ae865f;hpb=2ae065a564fc13c5fe890a40557e280d2aec06f4;p=elisp%2Fgnus.git- diff --git a/lisp/nndoc.el b/lisp/nndoc.el index 0fe68e4..8124262 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -1,5 +1,5 @@ ;;; nndoc.el --- single file access for Gnus -;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc. +;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -38,7 +38,7 @@ (defvoo nndoc-article-type 'guess "*Type of the file. One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', -`rfc934', `rfc822-forward', `mime-digest', `mime-parts', `standard-digest', +`rfc934', `rfc822-forward', `mime-parts', `standard-digest', `slack-digest', `clari-briefs' or `guess'.") (defvoo nndoc-post-type 'mail @@ -47,7 +47,7 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (defvoo nndoc-open-document-hook 'nnheader-ms-strip-cr "Hook run after opening a document. The default function removes all trailing carriage returns -from the document.") +from the document.") (defvar nndoc-type-alist `((mmdf @@ -81,12 +81,6 @@ from the document.") (head-end . "^\t") (generate-head-function . nndoc-generate-clari-briefs-head) (article-transform-function . nndoc-transform-clari-briefs)) - (mime-digest - (article-begin . "") - (head-end . "^ ?$") - (body-end . "") - (file-end . "") - (subtype digest guess)) (mime-parts (generate-head-function . nndoc-generate-mime-parts-head) (article-transform-function . nndoc-transform-mime-parts)) @@ -143,7 +137,7 @@ from the document.") (defvoo nndoc-head-begin-function nil) (defvoo nndoc-body-end nil) ;; nndoc-dissection-alist is a list of sublists. Each sublist holds the -;; following items. ARTICLE act as the association key and is an ordinal +;; following items. ARTICLE acts as the association key and is an ordinal ;; starting at 1. HEAD-BEGIN [0], HEAD-END [1], BODY-BEGIN [2] and BODY-END ;; [3] are positions in the `nndoc' buffer. LINE-COUNT [4] is a count of ;; lines in the body. For MIME dissections only, ARTICLE-INSERT [5] and @@ -188,7 +182,7 @@ from the document.") (insert-buffer-substring nndoc-current-buffer (car entry) (nth 1 entry))) (goto-char (point-max)) - (unless (= (char-after (1- (point))) ?\n) + (unless (eq (char-after (1- (point))) ?\n) (insert "\n")) (insert (format "Lines: %d\n" (nth 4 entry))) (insert ".\n"))) @@ -453,18 +447,18 @@ from the document.") (limit (search-forward "\n\n" nil t))) (goto-char (point-min)) (when (and limit - (re-search-forward - (concat "\ -^Content-Type:[ \t]*multipart/[a-z]+;\\(.*;\\)*" - "[ \t\n]*[ \t]boundary=\"?[^\"\n]*[^\" \t\n]") - limit t)) + (re-search-forward + (concat "\ +^Content-Type:[ \t]*multipart/[a-z]+ *;\\(\\(\n[ \t]\\)?.*;\\)*" + "\\(\n[ \t]\\)?[ \t]*boundary=\"?[^\"\n]*[^\" \t\n]") + limit t)) t))) (defun nndoc-transform-mime-parts (article) (let* ((entry (cdr (assq article nndoc-dissection-alist))) (headers (nth 5 entry))) (when headers - (goto-char (point-min)) + (goto-char (point-min)) (insert headers)))) (defun nndoc-generate-mime-parts-head (article) @@ -506,27 +500,6 @@ from the document.") (insert "From: " "clari@clari.net (" (or from "unknown") ")" "\nSubject: " (or subject "(no subject)") "\n"))) -(defun nndoc-mime-digest-type-p () - (let ((case-fold-search t) - boundary-id b-delimiter entry) - (when (and - (re-search-forward - (concat "^Content-Type: *multipart/digest;[ \t\n]*[ \t]" - "boundary=\"?\\([^\"\n]*[^\" \t\n]\\)") - nil t) - (match-beginning 1)) - (setq boundary-id (match-string 1) - b-delimiter (concat "\n--" boundary-id "[\n \t]+")) - (setq entry (assq 'mime-digest nndoc-type-alist)) - (setcdr entry - (list - (cons 'head-end "^ ?$") - (cons 'body-begin "^ ?\n") - (cons 'article-begin b-delimiter) - (cons 'body-end-function 'nndoc-digest-body-end) - (cons 'file-end (concat "\n--" boundary-id "--[ \t]*$")))) - t))) - (defun nndoc-standard-digest-type-p () (when (and (re-search-forward (concat "^" (make-string 70 ?-) "\n\n") nil t) (re-search-forward @@ -673,19 +646,20 @@ PARENT is the message-ID of the parent summary line, or nil for none." (message-id (nnmail-message-id)) head-end body-begin summary-insert message-rfc822 multipart-any subject content-type type subtype boundary-regexp) - ;; Gracefully handle a missing body. - (goto-char head-begin) - (if (search-forward "\n\n" body-end t) - (setq head-end (1- (point)) - body-begin (point)) + ;; Gracefully handle a missing body. + (goto-char head-begin) + (if (search-forward "\n\n" body-end t) + (setq head-end (1- (point)) + body-begin (point)) (setq head-end body-end body-begin body-end)) (narrow-to-region head-begin head-end) - ;; Save MIME attributes. - (goto-char head-begin) + ;; Save MIME attributes. + (goto-char head-begin) (setq content-type (message-fetch-field "Content-Type")) (when content-type - (when (string-match "^ *\\([^ \t\n/;]+\\)/\\([^ \t\n/;]+\\)" content-type) + (when (string-match + "^ *\\([^ \t\n/;]+\\)/\\([^ \t\n/;]+\\)" content-type) (setq type (downcase (match-string 1 content-type)) subtype (downcase (match-string 2 content-type)) message-rfc822 (and (string= type "message") @@ -694,7 +668,7 @@ PARENT is the message-ID of the parent summary line, or nil for none." (when (string-match ";[ \t\n]*name=\\([^ \t\n;]+\\)" content-type) (setq subject (match-string 1 content-type))) (when (string-match "boundary=\"?\\([^\"\n]*[^\" \t\n]\\)" content-type) - (setq boundary-regexp (concat "\n--" + (setq boundary-regexp (concat "^--" (regexp-quote (match-string 1 content-type)) "\\(--\\)?[ \t]*\n")))) @@ -702,8 +676,8 @@ PARENT is the message-ID of the parent summary line, or nil for none." (when (or multipart-any (not article-insert)) (setq subject (message-fetch-field "Subject")))) (unless type - (setq type "text" - subtype "plain")) + (setq type "text" + subtype "plain")) ;; Prepare the article and summary inserts. (unless article-insert (setq article-insert (buffer-substring (point-min) (point-max)) @@ -715,8 +689,8 @@ PARENT is the message-ID of the parent summary line, or nil for none." (and position multipart-any ".") (and multipart-any "*") (and (or position multipart-any) " ") - (cond ((string= subtype "plain") type) - ((string= subtype "basic") type) + (cond ((string= subtype "plain") type) + ((string= subtype "basic") type) (t subtype)) ">" (and subject " ") @@ -739,13 +713,13 @@ PARENT is the message-ID of the parent summary line, or nil for none." summary-insert) (replace-match line t t summary-insert) (concat summary-insert line))))) - ;; Generate dissection information for this entity. - (push (list (incf nndoc-mime-split-ordinal) - head-begin head-end body-begin body-end - (count-lines body-begin body-end) + ;; Generate dissection information for this entity. + (push (list (incf nndoc-mime-split-ordinal) + head-begin head-end body-begin body-end + (count-lines body-begin body-end) article-insert summary-insert) - nndoc-dissection-alist) - ;; Recurse for all sub-entities, if any. + nndoc-dissection-alist) + ;; Recurse for all sub-entities, if any. (widen) (cond (message-rfc822