From: Kevin Ryde <user42@zip.com.au>
Date: Sat, 7 Jul 2012 10:10:47 +0000 (+0800)
Subject: * woman.el (woman2-process-escapes): Handle nofill regions.
X-Git-Tag: emacs-24.2.90~1199^2~153
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87a92845e76bbf47a94fe7900313ace2979d5ec3;p=emacs.git

* woman.el (woman2-process-escapes): Handle nofill regions.

Fixes: debbugs:11591
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dc857d134a..63a050fbcf5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,9 @@
-2012-07-07  Kevin Ryde <user42@zip.com.au>
+2012-07-07  Kevin Ryde  <user42@zip.com.au>
 
 	* woman.el (woman-strings): Fix double-quote handling (Bug#1151).
 	(woman-decode-region): Replace escaped-escapes without destroying
 	bold or underline (Bug#11552).
+	(woman2-process-escapes): Handle nofill regions (Bug#11591).
 
 2012-07-07  Chong Yidong  <cyd@gnu.org>
 
diff --git a/lisp/woman.el b/lisp/woman.el
index 4767b062335..32aee3baff8 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3932,7 +3932,9 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
     (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)))