aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-01-12 23:21:25 +0000
committerGlenn Morris2008-01-12 23:21:25 +0000
commit1e1cbbbff99d787ae8c558d5ae627ffff46aced6 (patch)
tree8a5bb6a235e45fdf300e280e8340c54423b84a31
parent0ebec7d35c363197865d0d4ba7fdfb9eda221b3b (diff)
downloademacs-1e1cbbbff99d787ae8c558d5ae627ffff46aced6.tar.gz
emacs-1e1cbbbff99d787ae8c558d5ae627ffff46aced6.zip
(woman-parse-numeric-arg): Change handling of `==': can be interned
without a function definition.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/woman.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d9fb0dfc13..5ffcef352c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-01-12 Glenn Morris <rgm@gnu.org>
2
3 * woman.el (woman-parse-numeric-arg): Change handling of `==':
4 can be interned without a function definition.
5
12008-01-12 Jason Rumney <jasonr@gnu.org> 62008-01-12 Jason Rumney <jasonr@gnu.org>
2 7
3 * nxml/nxml-mode.el (nxml-enable-unicode-char-name-sets) 8 * nxml/nxml-mode.el (nxml-enable-unicode-char-name-sets)
diff --git a/lisp/woman.el b/lisp/woman.el
index 0778d424324..2ba414aef9c 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3540,8 +3540,10 @@ The expression may be an argument in quotes."
3540 (setq value (funcall op value (woman-parse-numeric-value)))) 3540 (setq value (funcall op value (woman-parse-numeric-value))))
3541 ((looking-at "[<=>]=?") ; relational operators 3541 ((looking-at "[<=>]=?") ; relational operators
3542 (goto-char (match-end 0)) 3542 (goto-char (match-end 0))
3543 (setq op (or (intern-soft (match-string 0)) 3543 (setq op (intern-soft
3544 (intern-soft "="))) 3544 (if (string-equal (match-string 0) "==")
3545 "="
3546 (match-string 0))))
3545 (setq value (if (funcall op value (woman-parse-numeric-value)) 3547 (setq value (if (funcall op value (woman-parse-numeric-value))
3546 1 0))) 3548 1 0)))
3547 ((memq (setq op (following-char)) '(?& ?:)) ; Boolean and / or 3549 ((memq (setq op (following-char)) '(?& ?:)) ; Boolean and / or