From 40e22d80ae027f2a833be444d95bce832b68e54c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 28 Jan 2011 16:20:40 -0500 Subject: [PATCH] Fix for woman escape sequence processing (Bug#7843). * lisp/woman.el (woman0-roff-buffer): Process roff escape sequences occurring prior to the first request. --- lisp/ChangeLog | 5 +++++ lisp/woman.el | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2606b5d62ea..272c1359008 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-28 Chong Yidong + + * woman.el (woman0-roff-buffer): Process roff escape sequences + occurring prior to the first request (Bug#7843). + 2011-01-28 Stefan Monnier 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." (woman0-search-regex-start woman0-search-regex-start) (woman0-search-regex (concat woman0-search-regex-start woman0-search-regex-end)) + processed-first-hunk woman0-rename-alist) (set-marker-insertion-type woman0-if-to t) (while (re-search-forward woman0-search-regex nil t) (setq woman-request (match-string 1)) + + ;; Process escape sequences prior to first request (Bug#7843). + (unless processed-first-hunk + (setq processed-first-hunk t) + (let ((process-escapes-to-marker (point-marker))) + (set-marker-insertion-type process-escapes-to-marker t) + (save-match-data + (save-excursion + (goto-char from) + (woman2-process-escapes process-escapes-to-marker))))) + (cond ((string= woman-request "ig") (woman0-ig)) ((string= woman-request "if") (woman0-if "if")) ((string= woman-request "ie") (woman0-if "ie")) -- 2.39.2