diff src/doc.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 ecf1ebac70d8
children 959746c534f6
line wrap: on
line diff
--- a/src/doc.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/doc.c	Tue Oct 25 11:16:49 2005 +0000
@@ -793,7 +793,7 @@
   Bytecount strlength;
   Bytecount idx;
   Bytecount bsize;
-  Ibyte *new;
+  Ibyte *new_;
   Lisp_Object tem = Qnil;
   Lisp_Object keymap = Qnil;
   Lisp_Object name = Qnil;
@@ -904,9 +904,9 @@
 
 	    if (NILP (tem))	/* but not on any keys */
 	      {
-		new = (Ibyte *) xrealloc (buf, bsize += 4);
-		bufp += new - buf;
-		buf = new;
+		new_ = (Ibyte *) xrealloc (buf, bsize += 4);
+		bufp += new_ - buf;
+		buf = new_;
 		memcpy (bufp, "M-x ", 4);
 		bufp += 4;
 		goto subst;
@@ -978,9 +978,9 @@
 	  length = XSTRING_LENGTH (tem);
 	subst:
 	  bsize += length;
-	  new = (Ibyte *) xrealloc (buf, bsize);
-	  bufp += new - buf;
-	  buf = new;
+	  new_ = (Ibyte *) xrealloc (buf, bsize);
+	  bufp += new_ - buf;
+	  buf = new_;
 	  memcpy (bufp, start, length);
 	  bufp += length;