Mercurial > hg > xemacs-beta

diff lwlib/lwlib.c @ 3025:facf3239ba30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents 04bc9d2f42c7
children 383ab474a241
line wrap: on
line diff
--- a/lwlib/lwlib.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/lwlib/lwlib.c	Tue Oct 25 11:16:49 2005 +0000
@@ -193,7 +193,7 @@
 
 /*
  * Return true if old->scrollbar_data were not equivalent
- * to new->scrollbar_data.
+ * to new_->scrollbar_data.
  */
 static Boolean
 merge_scrollbar_values (widget_value *old, widget_value *new_)
@@ -238,33 +238,33 @@
 #ifdef HAVE_X_WIDGETS
 /*
  * Return true if old->args was not equivalent
- * to new->args.
+ * to new_->args.
  */
 static Boolean
-merge_widget_value_args (widget_value *old, widget_value *new)
+merge_widget_value_args (widget_value *old, widget_value *new_)
 {
   Boolean changed = False;
 
-  if (new->args && !old->args)
+  if (new_->args && !old->args)
     {
-      lw_copy_widget_value_args (new, old);
+      lw_copy_widget_value_args (new_, old);
       changed = True;
     }
   /* Generally we don't want to lose values that are already in the
      widget. */
-  else if (!new->args && old->args)
+  else if (!new_->args && old->args)
     {
-      lw_copy_widget_value_args (old, new);
+      lw_copy_widget_value_args (old, new_);
       changed = True;
     }
-  else if (new->args && old->args && 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). */
-      lw_copy_widget_value_args (new, old);
+      lw_copy_widget_value_args (new_, old);
       changed = True;
     }
-  else if (new->args && new->args == old->args && new->args->args_changed == True)
+  else if (new_->args && new_->args == old->args && new_->args->args_changed == True)
     {
       changed = True;
     }