[Emacs-diffs] /srv/bzr/emacs/trunk r108934: * woman.el (woman2-process-escapes): Handle nofill regions.

[Chong Yidong]

------------------------------------------------------------
revno: 108934
fixes bug: http://debbugs.gnu.org/11591
author: Kevin Ryde <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-07 18:10:47 +0800
message:
  * woman.el (woman2-process-escapes): Handle nofill regions.
modified:
  lisp/ChangeLog
  lisp/woman.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-07 10:06:38 +0000
+++ b/lisp/ChangeLog    2012-07-07 10:10:47 +0000
@@ -1,8 +1,9 @@
-2012-07-07  Kevin Ryde <address@hidden>
+2012-07-07  Kevin Ryde  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2012-07-07 10:06:38 +0000
+++ b/lisp/woman.el     2012-07-07 10:10:47 +0000
@@ -3932,7 +3932,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)))