aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-01-28 16:20:40 -0500
committerChong Yidong2011-01-28 16:20:40 -0500
commit40e22d80ae027f2a833be444d95bce832b68e54c (patch)
treeeb249bfed787dd080758ede9cf613e8867357f05
parent6b91861333edd51848aa927c9b22d4ef431c2d01 (diff)
downloademacs-40e22d80ae027f2a833be444d95bce832b68e54c.tar.gz
emacs-40e22d80ae027f2a833be444d95bce832b68e54c.zip
Fix for woman escape sequence processing (Bug#7843).
* lisp/woman.el (woman0-roff-buffer): Process roff escape sequences occurring prior to the first request.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/woman.el12
2 files changed, 17 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2606b5d62ea..272c1359008 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-01-28 Chong Yidong <cyd@stupidchicken.com>
2
3 * woman.el (woman0-roff-buffer): Process roff escape sequences
4 occurring prior to the first request (Bug#7843).
5
12011-01-28 Stefan Monnier <monnier@iro.umontreal.ca> 62011-01-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 Port features from the previous prolog.el to the new one. 8 Port features from the previous prolog.el to the new one.
diff --git a/lisp/woman.el b/lisp/woman.el
index 9ab024d9d0f..ac4ace62bf1 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2478,10 +2478,22 @@ Start at FROM and re-scan new text as appropriate."
2478 (woman0-search-regex-start woman0-search-regex-start) 2478 (woman0-search-regex-start woman0-search-regex-start)
2479 (woman0-search-regex 2479 (woman0-search-regex
2480 (concat woman0-search-regex-start woman0-search-regex-end)) 2480 (concat woman0-search-regex-start woman0-search-regex-end))
2481 processed-first-hunk
2481 woman0-rename-alist) 2482 woman0-rename-alist)
2482 (set-marker-insertion-type woman0-if-to t) 2483 (set-marker-insertion-type woman0-if-to t)
2483 (while (re-search-forward woman0-search-regex nil t) 2484 (while (re-search-forward woman0-search-regex nil t)
2484 (setq woman-request (match-string 1)) 2485 (setq woman-request (match-string 1))
2486
2487 ;; Process escape sequences prior to first request (Bug#7843).
2488 (unless processed-first-hunk
2489 (setq processed-first-hunk t)
2490 (let ((process-escapes-to-marker (point-marker)))
2491 (set-marker-insertion-type process-escapes-to-marker t)
2492 (save-match-data
2493 (save-excursion
2494 (goto-char from)
2495 (woman2-process-escapes process-escapes-to-marker)))))
2496
2485 (cond ((string= woman-request "ig") (woman0-ig)) 2497 (cond ((string= woman-request "ig") (woman0-ig))
2486 ((string= woman-request "if") (woman0-if "if")) 2498 ((string= woman-request "if") (woman0-if "if"))
2487 ((string= woman-request "ie") (woman0-if "ie")) 2499 ((string= woman-request "ie") (woman0-if "ie"))