diff src/marker.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 6fa9919a9a0b
children d674024a8674 3742ea8250b5
line wrap: on
line diff
--- a/src/marker.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/marker.c	Tue Oct 25 11:16:49 2005 +0000
@@ -397,20 +397,20 @@
 static Lisp_Object
 copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum)
 {
-  REGISTER Lisp_Object new;
+  REGISTER Lisp_Object new_;
 
   while (1)
     {
       if (INTP (marker) || MARKERP (marker))
 	{
 	  if (noseeum)
-	    new = noseeum_make_marker ();
+	    new_ = noseeum_make_marker ();
 	  else
-	    new = Fmake_marker ();
-	  Fset_marker (new, marker,
+	    new_ = Fmake_marker ();
+	  Fset_marker (new_, marker,
 		       (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
-	  XMARKER (new)->insertion_type = !NILP (type);
-	  return new;
+	  XMARKER (new_)->insertion_type = !NILP (type);
+	  return new_;
 	}
       else
 	marker = wrong_type_argument (Qinteger_or_marker_p, marker);