aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-01-12 23:21:43 +0000
committerGlenn Morris2008-01-12 23:21:43 +0000
commit2769422068be44ed3b8af00e23beb6ede145d6bb (patch)
treedef269d899bf4232be6446bf88fc5f1dcd64e8c7
parentdd18f44f3b00001171e7b98b8ca5a8b036e337f2 (diff)
downloademacs-2769422068be44ed3b8af00e23beb6ede145d6bb.tar.gz
emacs-2769422068be44ed3b8af00e23beb6ede145d6bb.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 ef40bc36c9e..5f19204e0b5 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 Eli Zaretskii <eliz@gnu.org> 62008-01-12 Eli Zaretskii <eliz@gnu.org>
2 7
3 * view.el (view-file-other-window, view-file-other-frame): Don't 8 * view.el (view-file-other-window, view-file-other-frame): Don't
diff --git a/lisp/woman.el b/lisp/woman.el
index a04b606280b..595bb6cc9a1 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3558,8 +3558,10 @@ The expression may be an argument in quotes."
3558 (setq value (funcall op value (woman-parse-numeric-value)))) 3558 (setq value (funcall op value (woman-parse-numeric-value))))
3559 ((looking-at "[<=>]=?") ; relational operators 3559 ((looking-at "[<=>]=?") ; relational operators
3560 (goto-char (match-end 0)) 3560 (goto-char (match-end 0))
3561 (setq op (or (intern-soft (match-string 0)) 3561 (setq op (intern-soft
3562 (intern-soft "="))) 3562 (if (string-equal (match-string 0) "==")
3563 "="
3564 (match-string 0))))
3563 (setq value (if (funcall op value (woman-parse-numeric-value)) 3565 (setq value (if (funcall op value (woman-parse-numeric-value))
3564 1 0))) 3566 1 0)))
3565 ((memq (setq op (following-char)) '(?& ?:)) ; Boolean and / or 3567 ((memq (setq op (following-char)) '(?& ?:)) ; Boolean and / or