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

Fixes: debbugs:11591

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dc857d134af177843771e6ee75a1cf7c34b5fd2..63a050fbcf51de46d1a06145a57193d286134477 100644 (file)
--- 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 4767b062335000a4d484d422485f9bbb75b4cd76..32aee3baff8f69128cf1cb757048c83ecca4ae76 100644 (file)
--- 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)))