# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1268760284 14400
# Node ID 41f05dc4479339578f3bada39c26a8c186b6bdfb
# Parent  d062580ecdc6a9beda5714f3cce54fa1902d9c56
Woman parsing fix (Bug#5729).

* woman.el (woman2-process-escapes): Only consume the newline if
the filler character is on a line by itself (Bug#5729).

diff -r d062580ecdc6 -r 41f05dc44793 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Mar 16 16:05:46 2010 +0900
+++ b/lisp/ChangeLog	Tue Mar 16 13:24:44 2010 -0400
@@ -1,3 +1,8 @@
+2010-03-16  Chong Yidong  <cyd@stupidchicken.com>
+
+	* woman.el (woman2-process-escapes): Only consume the newline if
+	the filler character is on a line by itself (Bug#5729).
+
 2010-03-16  Kenichi Handa  <handa@m17n.org>
 
 	* language/indian.el (devanagari-composable-pattern): Add more
diff -r d062580ecdc6 -r 41f05dc44793 lisp/woman.el
--- a/lisp/woman.el	Tue Mar 16 16:05:46 2010 +0900
+++ b/lisp/woman.el	Tue Mar 16 13:24:44 2010 -0400
@@ -3876,10 +3876,14 @@
   ;; The first two cases below could be merged (maybe)!
   (let ((from (point)))
     ;; Discard zero width filler character used to hide leading dots
-    ;; and zero width characters.  If on a line by itself, consume the
-    ;; newline as well, as this may interfere with (Bug#3651).
-    (while (re-search-forward "\\\\[&|^]\n?" to t)
-      (woman-delete-match 0))
+    ;; and zero width characters.
+    (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)
+	   (eq (char-after (match-beginning 0)) ?\n)
+	   (delete-char 1)))
+
     (goto-char from)
     ;; Interrupt text processing -- CONTINUE current text with the
     ;; next text line (after any control lines, unless processing to