[Emacs-diffs] /srv/bzr/emacs/trunk r109482: Fix two woman bugs.

[Chong Yidong]

------------------------------------------------------------
revno: 109482
fixes bugs: http://debbugs.gnu.org/12110 http://debbugs.gnu.org/12109
author: Kevin Ryde <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-07 11:57:05 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/woman.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-07 03:31:53 +0000
+++ b/lisp/ChangeLog    2012-08-07 03:57:05 +0000
@@ -1,3 +1,9 @@
+2012-08-07  Kevin Ryde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/cperl-mode.el (cperl-mode): Yet another fix for

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2012-07-31 13:32:21 +0000
+++ b/lisp/woman.el     2012-08-07 03:57:05 +0000
@@ -2531,7 +2531,8 @@
     (cond
      ;; ((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 "[ntoe]")
+     ;; Per groff ".if v" is recognised as false (it means -Tversatec).
+     ((looking-at "[ntoev]")
       (setq c (memq (following-char) woman-if-conditions-true)))
      ;; Unrecognized letter so reject:
      ((looking-at "[A-Za-z]") (setq c nil)
@@ -3569,7 +3570,7 @@
       (let (n)
        (forward-char)
        (setq n (woman-parse-numeric-arg))
-       (skip-syntax-forward " ")
+       (skip-syntax-forward " " (line-end-position))
        (if (eq (following-char) ?\))
            (forward-char)
          (WoMan-warn "Parenthesis confusion in numeric expression!"))
@@ -3621,7 +3622,7 @@
                        (buffer-substring
                         (point)
                         (line-end-position)))
-           (skip-syntax-forward "^ ")
+           (skip-syntax-forward "^ " (line-end-position))
            0)
        (goto-char (match-end 0))
        ;; Check for scale factor: