diff src/chartab.c @ 3025:facf3239ba30

[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 1e7cc382eb16
children d830788d6a2c 3742ea8250b5
line wrap: on
line diff
--- a/src/chartab.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/chartab.c	Tue Oct 25 11:16:49 2005 +0000
@@ -643,11 +643,11 @@
 
   for (i = 0; i < 96; i++)
     {
-      Lisp_Object new = cte->level2[i];
-      if (CHAR_TABLE_ENTRYP (new))
-	ctenew->level2[i] = copy_char_table_entry (new);
+      Lisp_Object new_ = cte->level2[i];
+      if (CHAR_TABLE_ENTRYP (new_))
+	ctenew->level2[i] = copy_char_table_entry (new_);
       else
-	ctenew->level2[i] = new;
+	ctenew->level2[i] = new_;
     }
 
   return wrap_char_table_entry (ctenew);
@@ -677,22 +677,22 @@
 
   for (i = 0; i < NUM_ASCII_CHARS; i++)
     {
-      Lisp_Object new = ct->ascii[i];
+      Lisp_Object new_ = ct->ascii[i];
 #ifdef MULE
-      assert (! (CHAR_TABLE_ENTRYP (new)));
+      assert (! (CHAR_TABLE_ENTRYP (new_)));
 #endif /* MULE */
-      ctnew->ascii[i] = new;
+      ctnew->ascii[i] = new_;
     }
 
 #ifdef MULE
 
   for (i = 0; i < NUM_LEADING_BYTES; i++)
     {
-      Lisp_Object new = ct->level1[i];
-      if (CHAR_TABLE_ENTRYP (new))
-	ctnew->level1[i] = copy_char_table_entry (new);
+      Lisp_Object new_ = ct->level1[i];
+      if (CHAR_TABLE_ENTRYP (new_))
+	ctnew->level1[i] = copy_char_table_entry (new_);
       else
-	ctnew->level1[i] = new;
+	ctnew->level1[i] = new_;
     }
 
 #endif /* MULE */