From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/40239 Path: main.gmane.org!not-for-mail From: Samuel Padgett Newsgroups: gmane.emacs.gnus.general Subject: Re: possible bug? or feature? with slurping DOS files under Unix Date: Mon, 12 Nov 2001 22:14:53 -0500 Sender: owner-ding@hpc.uh.edu Message-ID: <20011112221453.A30315@harpo.homeip.net> References: NNTP-Posting-Host: coloc-standby.netfonds.no Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1035175820 32292 80.91.224.250 (21 Oct 2002 04:50:20 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 21 Oct 2002 04:50:20 +0000 (UTC) Cc: Ted Zlatanov , ding@gnus.org Return-Path: Original-Received: (qmail 3555 invoked from network); 13 Nov 2001 03:15:25 -0000 Original-Received: from malifon.math.uh.edu (129.7.128.13) by mastaler.com with SMTP; 13 Nov 2001 03:15:25 -0000 Original-Received: from sina.hpc.uh.edu ([129.7.128.10] ident=lists) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 163U20-0003En-00; Mon, 12 Nov 2001 21:14:36 -0600 Original-Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Mon, 12 Nov 2001 21:14:19 -0600 (CST) Original-Received: from sclp3.sclp.com (qmailr@sclp3.sclp.com [209.196.61.66]) by sina.hpc.uh.edu (8.9.3/8.9.3) with SMTP id VAA20330 for ; Mon, 12 Nov 2001 21:14:09 -0600 (CST) Original-Received: (qmail 3543 invoked by alias); 13 Nov 2001 03:14:19 -0000 Original-Received: (qmail 3538 invoked from network); 13 Nov 2001 03:14:18 -0000 Original-Received: from rdu57-93-147.nc.rr.com (HELO harpo.homeip.net) (66.57.93.147) by gnus.org with SMTP; 13 Nov 2001 03:14:18 -0000 Original-Received: from sam by harpo.homeip.net with local (Exim 3.32 #1 (Debian)) id 163U2H-0007wn-00; Mon, 12 Nov 2001 22:14:53 -0500 Original-To: Simon Josefsson Mail-Followup-To: Simon Josefsson , Ted Zlatanov , ding@gnus.org Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.23i Precedence: list X-Majordomo: 1.94.jlt7 Xref: main.gmane.org gmane.emacs.gnus.general:40239 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:40239 Simon Josefsson writes: > I remember patching something recently to work around that > problem, but I don't recall what exactly or if it was committed. I think that was for me. Sam 2001-09-15 Simon Josefsson * nnml.el (nnml-parse-head): Handle CRLF files. (nnml-generate-nov-file): Ditto. (nnml-retrieve-headers): Ditto. Index: nnml.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnml.el,v retrieving revision 6.25 diff -u -u -w -u -w -r6.25 nnml.el --- nnml.el 2001/09/08 20:55:16 6.25 +++ nnml.el 2001/09/15 21:17:19 @@ -157,7 +157,7 @@ (setq beg (point)) (nnheader-insert-head file) (goto-char beg) - (if (search-forward "\n\n" nil t) + (if (re-search-forward "\n\r?\n" nil t) (forward-char -1) (goto-char (point-max)) (insert "\n\n")) @@ -713,13 +713,15 @@ (unless (zerop (buffer-size)) (narrow-to-region (goto-char (point-min)) - (if (search-forward "\n\n" nil t) (1- (point)) (point-max)))) + (if (re-search-forward "\n\r?\n" nil t) (1- (point)) (point-max)))) ;; Fold continuation lines. (goto-char (point-min)) (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) (replace-match " " t t)) ;; Remove any tabs; they are too confusing. (subst-char-in-region (point-min) (point-max) ?\t ? ) + ;; Remove any ^M's; they are too confusing. + (subst-char-in-region (point-min) (point-max) ?\r ? ) (let ((headers (nnheader-parse-head t))) (mail-header-set-chars headers chars) (mail-header-set-number headers number) @@ -838,7 +840,7 @@ (narrow-to-region (goto-char (point-min)) (progn - (search-forward "\n\n" nil t) + (re-search-forward "\n\r?\n" nil t) (setq chars (- (point-max) (point))) (max 1 (1- (point))))) (unless (zerop (buffer-size))