diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/core/wee-eval.c | 2 | ||||
| -rw-r--r-- | src/core/wee-eval.h | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.4.2-dev, 2013-07-22 +v0.4.2-dev, 2013-07-24 This document lists all changes for each version. @@ -14,6 +14,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] Version 0.4.2 (under dev!) -------------------------- +* core: fix priority of logical operators in evaluation of expression + (AND takes precedence over the OR) * core: remove gap after read marker line when there is no bar on the right (bug #39548) * core: add CA_FILE option in cmake and configure to setup default diff --git a/src/core/wee-eval.c b/src/core/wee-eval.c index abd1b03db..2fce50097 100644 --- a/src/core/wee-eval.c +++ b/src/core/wee-eval.c @@ -40,7 +40,7 @@ #include "../plugins/plugin.h" -char *logical_ops[EVAL_NUM_LOGICAL_OPS] = { "&&", "||" }; +char *logical_ops[EVAL_NUM_LOGICAL_OPS] = { "||", "&&" }; char *comparisons[EVAL_NUM_COMPARISONS] = { "==", "!=", "<=", "<", ">=", ">", "=~", "!~" }; diff --git a/src/core/wee-eval.h b/src/core/wee-eval.h index bd3174d48..d768ff2cb 100644 --- a/src/core/wee-eval.h +++ b/src/core/wee-eval.h @@ -27,8 +27,8 @@ struct t_hashtable; enum t_eval_logical_op { - EVAL_LOGICAL_OP_AND = 0, - EVAL_LOGICAL_OP_OR, + EVAL_LOGICAL_OP_OR = 0, + EVAL_LOGICAL_OP_AND, /* number of comparison strings */ EVAL_NUM_LOGICAL_OPS, }; |