Mercurial > hg > xemacs-beta

diff src/window.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 b7f26b2f78bd
children 135bb6aa3ee2
line wrap: on
line diff
--- a/src/window.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/window.c	Tue Oct 25 11:16:49 2005 +0000
@@ -3800,11 +3800,11 @@
 static void
 make_dummy_parent (Lisp_Object window)
 {
-  Lisp_Object new;
+  Lisp_Object new_;
   struct window *o = XWINDOW (window);
   struct window *p = ALLOC_LCRECORD_TYPE (struct window, &lrecord_window);
 
-  new = wrap_window (p);
+  new_ = wrap_window (p);
   COPY_LCRECORD (p, o);
 
   /* Don't copy the pointers to the line start cache or the face
@@ -3816,13 +3816,13 @@
     make_image_instance_cache_hash_table ();
 
   /* Put new into window structure in place of window */
-  replace_window (window, new);
+  replace_window (window, new_);
 
   o->next = Qnil;
   o->prev = Qnil;
   o->vchild = Qnil;
   o->hchild = Qnil;
-  o->parent = new;
+  o->parent = new_;
 
   p->start[CURRENT_DISP] = Qnil;
   p->start[DESIRED_DISP] = Qnil;
@@ -3845,7 +3845,7 @@
 */
        (window, size, horflag))
 {
-  Lisp_Object new;
+  Lisp_Object new_;
   struct window *o, *p;
   struct frame *f;
   int csize;
@@ -3908,8 +3908,8 @@
 	     and see the difference.  See redisplay-tests.el  --yh */
 	  reset_face_cachels (XWINDOW (window));
 #endif
-	  new = o->parent;
-	  XWINDOW (new)->vchild = window;
+	  new_ = o->parent;
+	  XWINDOW (new_)->vchild = window;
 	  XFRAME (o->frame)->mirror_dirty = 1;
 	}
     }
@@ -3928,8 +3928,8 @@
 	  /* #### See above. */
 	  reset_face_cachels (XWINDOW (window));
 #endif
-	  new = o->parent;
-	  XWINDOW (new)->hchild = window;
+	  new_ = o->parent;
+	  XWINDOW (new_)->hchild = window;
 	  XFRAME (o->frame)->mirror_dirty = 1;
 	}
     }
@@ -3939,15 +3939,15 @@
      if we are making side-by-side windows */
 
   MARK_FRAME_WINDOWS_STRUCTURE_CHANGED (f);
-  new = allocate_window ();
-  p = XWINDOW (new);
+  new_ = allocate_window ();
+  p = XWINDOW (new_);
 
   p->frame = o->frame;
   p->next = o->next;
   if (!NILP (p->next))
-    XWINDOW (p->next)->prev = new;
+    XWINDOW (p->next)->prev = new_;
   p->prev = window;
-  o->next = new;
+  o->next = new_;
   p->parent = o->parent;
   p->buffer = Qt;
 
@@ -3976,13 +3976,13 @@
 
   XFRAME (p->frame)->mirror_dirty = 1;
 
-  note_object_created (new);
+  note_object_created (new_);
 
   /* do this last (after the window is completely initialized and
      the mirror-dirty flag is set) so that specifier recomputation
      caused as a result of this will work properly and not abort. */
-  Fset_window_buffer (new, o->buffer, Qt);
-  return new;
+  Fset_window_buffer (new_, o->buffer, Qt);
+  return new_;
 }