Mercurial > emacs

changeset 14879:70f79ccb9875

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(merge_widget_value): Set the this_one_change field.
author Richard M. Stallman <rms@gnu.org>
date Mon, 25 Mar 1996 01:47:33 +0000
parents 487b03096cc5
children b405f39b5493
files lwlib/lwlib.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lwlib/lwlib.c	Mon Mar 25 01:47:16 1996 +0000
+++ b/lwlib/lwlib.c	Mon Mar 25 01:47:33 1996 +0000
@@ -238,6 +238,7 @@
   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 @@
      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 @@
       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 @@
 
   val1->next = merged_next;
 
+  val1->this_one_change = this_one_change;
   val1->change = change;
   
   if (change > NO_CHANGE && val1->toolkit_data)