X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lwlib%2Flwlib.c;h=062a4529ffee3de547de6cc13f875fcea72db3cc;hb=a1655b870904de973c366d85ebdc8adde4ef5e1e;hp=27f7a08a0ad8c0ef601fc2672005437456aa56a6;hpb=c855f9c824a0fc23e52e92d65ec8a34bd51cddd7;p=chise%2Fxemacs-chise.git

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 27f7a08..062a452 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -257,7 +257,7 @@ merge_widget_value_args (widget_value *old, widget_value *new)
       lw_copy_widget_value_args (old, new);
       changed = True;
     }
-  else if (new->args && old->args)
+  else if (new->args && old->args && new->args != old->args)
     {
       /* #### Do something more sensible here than just copying the
          new values (like actually merging the values). */
@@ -1048,14 +1048,14 @@ lw_destroy_all_widgets (LWLIB_ID id)
 }
 
 void
-lw_destroy_everything ()
+lw_destroy_everything (void)
 {
   while (all_widget_info)
     lw_destroy_all_widgets (all_widget_info->id);
 }
 
 void
-lw_destroy_all_pop_ups ()
+lw_destroy_all_pop_ups (void)
 {
   widget_info *info;
   widget_info *next;