summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-03-25 01:47:33 +0000
committerRichard M. Stallman <rms@gnu.org>1996-03-25 01:47:33 +0000
commit49fd1e3157dd5e9491881ca7b0ac8ca7a850eeea (patch)
tree55cac9ad86a1cddfae31db9d7c0153ec2059ba89 /lwlib
parentdc299ad715f688f01d6f369e89e7f1cbac8972be (diff)
downloademacs-49fd1e3157dd5e9491881ca7b0ac8ca7a850eeea.tar.gz
(merge_widget_value): Set the this_one_change field.
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/lwlib.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index f71f6ef6d57..aea3c3b87ca 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -238,6 +238,7 @@ copy_widget_value_tree (val, change)
copy->selected = val->selected;
copy->edited = False;
copy->change = change;
+ copy->this_one_change = change;
copy->contents = copy_widget_value_tree (val->contents, change);
copy->call_data = val->call_data;
copy->next = copy_widget_value_tree (val->next, change);
@@ -439,7 +440,7 @@ merge_widget_value (val1, val2, level)
widget_value* val2;
int level;
{
- change_type change;
+ change_type change, this_one_change;
widget_value* merged_next;
widget_value* merged_contents;
@@ -530,6 +531,8 @@ merge_widget_value (val1, val2, level)
val1->contents = merged_contents;
}
+ this_one_change = change;
+
merged_next = merge_widget_value (val1->next, val2->next, level);
if (val1->next && !merged_next)
@@ -548,6 +551,7 @@ merge_widget_value (val1, val2, level)
val1->next = merged_next;
+ val1->this_one_change = this_one_change;
val1->change = change;
if (change > NO_CHANGE && val1->toolkit_data)