Re: address@hidden: WoMan Bug]

[David Hansen]

On Thu, 21 Sep 2006 23:01:35 -0400 Chong Yidong wrote:

> David Hansen <address@hidden> writes:
>
>> On Sat, 16 Sep 2006 13:58:39 -0400 Stefan Monnier wrote:
>>
>>> I believe the patch below catches all the places where the problem could
>>> have shown up.  Can someone check that it makes sense and works?
>>
>> Hmm, against which version of woman i have to apply this
>> patch?  Can't get it to work with a fresh updated emacs.
>
> Works for me.

I doubt.  It even has unbalanced parens.  But with a patched
patch it's rendering the screen man page (please check.  I
only did the obvious stuff to get it compiled w/o warnings).

*** /home/dhansen/.emacs.d/saves/!home!dhansen!woman.el.~1~     2006-09-23 
06:10:16.000000000 +0200
--- /home/dhansen/share/emacs/22.0.50/lisp/woman.el     2006-09-23 
06:24:46.000000000 +0200
***************
*** 2657,2665 ****
        (error "File `%s' not found" name))
      (beginning-of-line)
      (woman-delete-line 1)
!     (let ((from (point))
!         (length (woman-insert-file-contents filename 0))
!         (to (copy-marker (+ from length) t)))
        (woman-pre-process-region from to)
        (set-marker to nil)
        (goto-char from)
--- 2657,2665 ----
        (error "File `%s' not found" name))
      (beginning-of-line)
      (woman-delete-line 1)
!     (let* ((from (point))
!            (length (woman-insert-file-contents filename 0))
!            (to (copy-marker (+ from length) t)))
        (woman-pre-process-region from to)
        (set-marker to nil)
        (goto-char from)
***************
*** 3971,3984 ****
    (delete-char 1)
    (looking-at "\\(.\\)\\(.*\\)\\1")
    (forward-char 1)
!   (let* ((to (match-end 2)))
           (from (match-beginning 0))
           (N (woman-parse-numeric-arg))
           (c (if (< (point) to) (following-char) ?_)))
      (delete-region from to)
      (delete-char 1)
!     (insert (make-string N c))
!     ))
  
  ;;; 4. Text Filling, Adjusting, and Centering
  
--- 3971,3983 ----
    (delete-char 1)
    (looking-at "\\(.\\)\\(.*\\)\\1")
    (forward-char 1)
!   (let* ((to (match-end 2))
           (from (match-beginning 0))
           (N (woman-parse-numeric-arg))
           (c (if (< (point) to) (following-char) ?_)))
      (delete-region from to)
      (delete-char 1)
!     (insert (make-string N c))))
  
  ;;; 4. Text Filling, Adjusting, and Centering