1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00

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).
This commit is contained in:
Chong Yidong 2010-03-16 13:24:44 -04:00
parent fade35ddda
commit d5704d66b7
2 changed files with 13 additions and 4 deletions

View File

@ -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

View File

@ -3876,10 +3876,14 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
;; 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