Compare commits

..

No commits in common. "ee93d52a262bcc8908d8a9d2f6687531b2663f02" and "ba7004fd5bcf81f3ad9bdb85b8754d8a2a780cc5" have entirely different histories.

2 changed files with 2 additions and 5 deletions

View File

@ -1 +1 @@
1.5.294
1.5.293

View File

@ -2248,10 +2248,7 @@ int PromoteProperty(struct property *prop, struct valuelist *vl,
if (prop == NULL || vl == NULL) return -1;
if (prop->type == vl->type) return 1; /* Nothing to do */
result = 0;
/* If vl is an expression but prop is not, then try to reduce
* the expression in vl.
*/
if (vl->type == PROP_EXPRESSION) {
if (prop->type == PROP_EXPRESSION) {
ReduceOneExpression(vl, ob, tc, FALSE);
}
switch (prop->type) {