Commit 54eea618 authored by Kevin Ryde's avatar Kevin Ryde Committed by Chong Yidong
Browse files

Fix two woman bugs.

* lisp/woman.el (woman0-if): Quietly treat ".if v" as false.
(woman-parse-numeric-value): On a bad .IP line, issue a warning
and continue processing.

Fixes: debbugs:12110 debbugs:12109
parent 9f6f4845
2012-08-07 Kevin Ryde <user42@zip.com.au>
* woman.el (woman0-if): Quietly treat ".if v" as false (Bug#12109).
(woman-parse-numeric-value): On a bad .IP line, issue a warning
and continue processing (Bug#12110).
2012-08-06 Stefan Monnier <monnier@iro.umontreal.ca> 2012-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
   
* progmodes/cperl-mode.el (cperl-mode): Yet another fix for * progmodes/cperl-mode.el (cperl-mode): Yet another fix for
......
...@@ -2531,7 +2531,8 @@ REQUEST is the invoking directive without the leading dot." ...@@ -2531,7 +2531,8 @@ REQUEST is the invoking directive without the leading dot."
(cond (cond
;; ((looking-at "[no]") (setq c t)) ; accept n(roff) and o(dd page) ;; ((looking-at "[no]") (setq c t)) ; accept n(roff) and o(dd page)
;; ((looking-at "[te]") (setq c nil)) ; reject t(roff) and e(ven page) ;; ((looking-at "[te]") (setq c nil)) ; reject t(roff) and e(ven page)
((looking-at "[ntoe]") ;; Per groff ".if v" is recognised as false (it means -Tversatec).
((looking-at "[ntoev]")
(setq c (memq (following-char) woman-if-conditions-true))) (setq c (memq (following-char) woman-if-conditions-true)))
;; Unrecognized letter so reject: ;; Unrecognized letter so reject:
((looking-at "[A-Za-z]") (setq c nil) ((looking-at "[A-Za-z]") (setq c nil)
...@@ -3569,7 +3570,7 @@ expression in parentheses. Leaves point after the value." ...@@ -3569,7 +3570,7 @@ expression in parentheses. Leaves point after the value."
(let (n) (let (n)
(forward-char) (forward-char)
(setq n (woman-parse-numeric-arg)) (setq n (woman-parse-numeric-arg))
(skip-syntax-forward " ") (skip-syntax-forward " " (line-end-position))
(if (eq (following-char) ?\)) (if (eq (following-char) ?\))
(forward-char) (forward-char)
(WoMan-warn "Parenthesis confusion in numeric expression!")) (WoMan-warn "Parenthesis confusion in numeric expression!"))
...@@ -3621,7 +3622,7 @@ expression in parentheses. Leaves point after the value." ...@@ -3621,7 +3622,7 @@ expression in parentheses. Leaves point after the value."
(buffer-substring (buffer-substring
(point) (point)
(line-end-position))) (line-end-position)))
(skip-syntax-forward "^ ") (skip-syntax-forward "^ " (line-end-position))
0) 0)
(goto-char (match-end 0)) (goto-char (match-end 0))
;; Check for scale factor: ;; Check for scale factor:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment