[Emacs-diffs] Changes to emacs/lisp/gnus/nndoc.el [gnus-5_10-branch]

[Reiner Steib]

Index: emacs/lisp/gnus/nndoc.el
diff -c emacs/lisp/gnus/nndoc.el:1.7.2.1 emacs/lisp/gnus/nndoc.el:1.7.2.2
*** emacs/lisp/gnus/nndoc.el:1.7.2.1    Thu Jul 22 16:45:51 2004
--- emacs/lisp/gnus/nndoc.el    Tue Aug 31 14:47:59 2004
***************
*** 1,5 ****
  ;;; nndoc.el --- single file access for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,5 ----
  ;;; nndoc.el --- single file access for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 130,137 ****
       (article-transform-function . nndoc-transform-lanl-gov-announce)
       (subtype preprints guess))
      (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"))
--- 130,139 ----
       (article-transform-function . nndoc-transform-lanl-gov-announce)
       (subtype preprints guess))
      (rfc822-forward
!      (article-begin . "^\n+")
!      (body-end-function . nndoc-rfc822-forward-body-end-function)
!      (generate-head-function . nndoc-rfc822-forward-generate-head)
!      (generate-article-function . nndoc-rfc822-forward-generate-article))
      (outlook
       (article-begin-function . nndoc-outlook-article-begin)
       (body-end .  "\0"))
***************
*** 469,475 ****
  (defun nndoc-forward-type-p ()
    (when (and (re-search-forward "^-+ \\(Start of \\)?forwarded message.*\n+"
                                nil t)
!            (looking-at "[\r\n]*[a-zA-Z][a-zA-Z0-9-]*:"))
      t))
  
  (defun nndoc-rfc934-type-p ()
--- 471,477 ----
  (defun nndoc-forward-type-p ()
    (when (and (re-search-forward "^-+ \\(Start of \\)?forwarded message.*\n+"
                                nil t)
!            (looking-at "[\r\n]*[a-zA-Z][a-zA-Z0-9-]*:\\|^>?From "))
      t))
  
  (defun nndoc-rfc934-type-p ()
***************
*** 492,497 ****
--- 494,522 ----
  (defun nndoc-rfc822-forward-body-end-function ()
    (goto-char (point-max)))
  
+ (defun nndoc-rfc822-forward-generate-article (article &optional head)
+   (let ((entry (cdr (assq article nndoc-dissection-alist)))
+       (begin (point))
+       encoding)
+     (with-current-buffer nndoc-current-buffer
+       (save-restriction
+       (message-narrow-to-head)
+       (setq encoding (message-fetch-field "content-transfer-encoding"))))
+     (insert-buffer-substring nndoc-current-buffer (car entry) (nth 3 entry))
+     (when encoding
+       (save-restriction
+       (narrow-to-region begin (point-max))
+       (mm-decode-content-transfer-encoding
+        (intern (downcase (mail-header-strip encoding))))))
+     (when head
+       (goto-char begin)
+       (when (search-forward "\n\n" nil t)
+       (delete-region (1- (point)) (point-max)))))
+   t)
+ 
+ (defun nndoc-rfc822-forward-generate-head (article)
+   (nndoc-rfc822-forward-generate-article article 'head))
+ 
  (defun nndoc-mime-parts-type-p ()
    (let ((case-fold-search t)
        (limit (search-forward "\n\n" nil t)))