Mercurial > hg > xemacs-beta

diff src/frame.c @ 2552:166ed8151e62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-02-03 16:30:33 by james] Don't define this to c_this, and rename variables currently named this. See xemacs-patches message with ID <psbrb1ehjl.fsf@diannao.ittc.ku.edu>.
author james
date Thu, 03 Feb 2005 16:30:38 +0000
parents 9f70af3ac939
children f15523a6da7a
line wrap: on
line diff
--- a/src/frame.c	Thu Feb 03 16:14:08 2005 +0000
+++ b/src/frame.c	Thu Feb 03 16:30:38 2005 +0000
@@ -1445,12 +1445,12 @@
 
       FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
 	{
-	  Lisp_Object this = XCAR (frmcons);
-
-	  if (! EQ (this, frame)
+	  Lisp_Object this_frame = XCAR (frmcons);
+
+	  if (! EQ (this_frame, frame)
 	      && EQ (frame, (WINDOW_FRAME
 			     (XWINDOW
-			      (FRAME_MINIBUF_WINDOW (XFRAME (this)))))))
+			      (FRAME_MINIBUF_WINDOW (XFRAME (this_frame)))))))
 	    {
 	      /* We've found another frame whose minibuffer is on
 		 this frame. */
@@ -1467,14 +1467,14 @@
 
     FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
       {
-	Lisp_Object this = XCAR (frmcons);
-
-
-	if (! EQ (this, frame))
+	Lisp_Object this_frame = XCAR (frmcons);
+
+
+	if (! EQ (this_frame, frame))
 	  {
 	    struct device *devcons_d = XDEVICE (XCAR (devcons));
 	    if (EQ (frame, DEVMETH_OR_GIVEN (devcons_d, get_frame_parent,
-					     (XFRAME (this)),
+					     (XFRAME (this_frame)),
 					     Qnil)))
 	      /* We've found a popup frame whose parent is this frame. */
 	      gui_error
@@ -1715,22 +1715,22 @@
 
       CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, con)
 	{
-	  Lisp_Object this;
+	  Lisp_Object this_frame;
 	  struct frame *f1;
 
-	  this = XCAR (frmcons);
-	  f1 = XFRAME (this);
+	  this_frame = XCAR (frmcons);
+	  f1 = XFRAME (this_frame);
 
 	  /* Consider only frames on the same console
 	     and only those with minibuffers.  */
 	  if (FRAME_HAS_MINIBUF_P (f1))
 	    {
-	      frame_with_minibuf = this;
+	      frame_with_minibuf = this_frame;
 	      if (FRAME_MINIBUF_ONLY_P (f1))
 		goto double_break_2;
 	    }
 
-	  frame_on_same_console = this;
+	  frame_on_same_console = this_frame;
 	}
     double_break_2: