From: Richard M. Stallman Date: Mon, 25 Mar 1996 01:47:33 +0000 (+0000) Subject: (merge_widget_value): Set the this_one_change field. X-Git-Tag: emacs-19.34~981 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c12a958b0d519820a144ed2ae164d6bccd8bf24;p=emacs.git (merge_widget_value): Set the this_one_change field. --- 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)