From unknown Sat Aug 16 13:45:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11591: 23.4; woman.el .nf blank \& Resent-From: Kevin Ryde Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 30 May 2012 23:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11591 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 11591@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.133841918130423 (code B ref -1); Wed, 30 May 2012 23:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 May 2012 23:06:21 +0000 Received: from localhost ([127.0.0.1]:50904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SZry8-0007uc-Mm for submit@debbugs.gnu.org; Wed, 30 May 2012 19:06:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41967) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SZry5-0007uQ-DK for submit@debbugs.gnu.org; Wed, 30 May 2012 19:06:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZrwV-0005rO-E5 for submit@debbugs.gnu.org; Wed, 30 May 2012 19:04:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_TVD_MIME_NO_HEADERS autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:37540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZrwV-0005rJ-Ak for submit@debbugs.gnu.org; Wed, 30 May 2012 19:04:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZrwT-00025c-IA for bug-gnu-emacs@gnu.org; Wed, 30 May 2012 19:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZrwR-0005r3-HR for bug-gnu-emacs@gnu.org; Wed, 30 May 2012 19:04:36 -0400 Received: from mailout2-14.pacific.net.au ([125.255.80.141]:55030 helo=mailout4-syd3.pacific.net.au) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZrwQ-0005qf-VT for bug-gnu-emacs@gnu.org; Wed, 30 May 2012 19:04:35 -0400 Received: from mailproxy3-syd3.pacific.net.au (mailproxy3-syd3.pacific.net.au [61.8.2.164]) by mailout4-syd3.pacific.net.au (Postfix) with ESMTP id F00433359D for ; Thu, 31 May 2012 09:04:23 +1000 (EST) Received: from blah.blah (unknown [203.26.175.207]) by mailproxy3-syd3.pacific.net.au (Postfix) with ESMTP id 00DF7578071 for ; Thu, 31 May 2012 09:04:23 +1000 (EST) Received: from gg by blah.blah with local (Exim 4.72) (envelope-from ) id 1SZrvF-0006UR-H0 for bug-gnu-emacs@gnu.org; Thu, 31 May 2012 09:03:21 +1000 From: Kevin Ryde Date: Thu, 31 May 2012 09:03:21 +1000 Message-ID: <874nqxxoee.fsf@blah.blah> User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.4 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) --=-=-= With the nf-blank.1 below, (woman-find-file "nf-blank.1") produces Unfilled line 1. Unfilled line 2. where I expected there would be a blank line in between, corresponding to the \& line. I think woman.el.nf-blank.diff below could correct this. 2012-05-29 Kevin Ryde * woman.el (woman2-process-escapes): For .nf preserve newline following \&. Fixes blank lines in perl pod2man "verbatim" blocks. Perl pod2man makes such \& lines for blank lines in "verbatim" blocks (usually sample code etc). Dunno if it really needs to do that. Maybe it distinguishes line spacing from paragraph spacing in troff or something. In any case for woman I don't think a \& on the line should remove it. --=-=-= Content-Disposition: inline; filename=nf-blank.1 .TH FOO 1 .SH DESCRIPTION .nf Unfilled line 1. \& Unfilled line 2. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=woman.el.nf-blank.diff diff -u /so/woman/woman-24.el /so/woman/woman.el --- /so/woman/woman-24.el 2012-05-18 14:59:04.000000000 +1000 +++ /so/woman/woman.el 2012-05-29 10:41:25.000000000 +1000 @@ -3931,7 +3931,9 @@ (while (re-search-forward "\\\\[&|^]" to t) (woman-delete-match 0) ;; If on a line by itself, consume newline as well (Bug#3651). - (and (eq (char-before (match-beginning 0)) ?\n) + ;; But not in a .nf region, preserve all newlines in that case. + (and (not woman-nofill) + (eq (char-before (match-beginning 0)) ?\n) (eq (char-after (match-beginning 0)) ?\n) (delete-char 1))) Diff finished. Tue May 29 10:41:30 2012 --=-=-= In GNU Emacs 23.4.1 (i486-pc-linux-gnu, GTK+ Version 2.24.10) of 2012-04-08 on biber, modified by Debian Windowing system distributor `The X.Org Foundation', version 11.0.10707000 configured using `configure '--build' 'i486-linux-gnu' '--build' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs23:/etc/emacs:/usr/local/share/emacs/23.4/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.4/site-lisp:/usr/share/emacs/site-lisp' '--with-crt-dir=/usr/lib/i386-linux-gnu' '--with-x=yes' '--with-x-toolkit=gtk' '--with-toolkit-scroll-bars' 'build_alias=i486-linux-gnu' 'CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -DDEBIAN -O2' 'CPPFLAGS=-D_FORTIFY_SOURCE=2'' -- Even the white bits were black. --=-=-=-- From unknown Sat Aug 16 13:45:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11591: 23.4; woman.el .nf blank \& Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 07 Jul 2012 10:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11591 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Kevin Ryde Cc: 11591@debbugs.gnu.org Received: via spool by 11591-submit@debbugs.gnu.org id=B11591.134165616120554 (code B ref 11591); Sat, 07 Jul 2012 10:16:02 +0000 Received: (at 11591) by debbugs.gnu.org; 7 Jul 2012 10:16:01 +0000 Received: from localhost ([127.0.0.1]:53985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SnS3U-0005LT-Qq for submit@debbugs.gnu.org; Sat, 07 Jul 2012 06:16:01 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:47098) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SnS3T-0005LM-2o for 11591@debbugs.gnu.org; Sat, 07 Jul 2012 06:15:59 -0400 Received: from [155.69.186.151] (port=33353 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SnRyY-0003DV-D3; Sat, 07 Jul 2012 06:10:55 -0400 From: Chong Yidong References: <874nqxxoee.fsf@blah.blah> Date: Sat, 07 Jul 2012 18:10:50 +0800 In-Reply-To: <874nqxxoee.fsf@blah.blah> (Kevin Ryde's message of "Thu, 31 May 2012 09:03:21 +1000") Message-ID: <874npjswyd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -6.9 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) Kevin Ryde writes: > With the nf-blank.1 below, > > (woman-find-file "nf-blank.1") > > produces > > Unfilled line 1. > Unfilled line 2. > > where I expected there would be a blank line in between, corresponding > to the \& line. > > I think woman.el.nf-blank.diff below could correct this. Committed, thanks. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 07 06:16:12 2012 Received: (at control) by debbugs.gnu.org; 7 Jul 2012 10:16:13 +0000 Received: from localhost ([127.0.0.1]:53989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SnS3g-0005MB-F5 for submit@debbugs.gnu.org; Sat, 07 Jul 2012 06:16:12 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:47103) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SnS3e-0005M4-N1 for control@debbugs.gnu.org; Sat, 07 Jul 2012 06:16:11 -0400 Received: from [155.69.186.151] (port=33354 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SnRyk-0003ED-Jz for control@debbugs.gnu.org; Sat, 07 Jul 2012 06:11:07 -0400 From: Chong Yidong To: control@debbugs.gnu.org Subject: close 11591 Date: Sat, 07 Jul 2012 18:11:02 +0800 Message-ID: <87ehonx4nd.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) close 11591 thanks