Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
2551:9f70af3ac939 2552:166ed8151e62
1443 { 1443 {
1444 Lisp_Object frmcons, devcons, concons; 1444 Lisp_Object frmcons, devcons, concons;
1445 1445
1446 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) 1446 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
1447 { 1447 {
1448 Lisp_Object this = XCAR (frmcons); 1448 Lisp_Object this_frame = XCAR (frmcons);
1449 1449
1450 if (! EQ (this, frame) 1450 if (! EQ (this_frame, frame)
1451 && EQ (frame, (WINDOW_FRAME 1451 && EQ (frame, (WINDOW_FRAME
1452 (XWINDOW 1452 (XWINDOW
1453 (FRAME_MINIBUF_WINDOW (XFRAME (this))))))) 1453 (FRAME_MINIBUF_WINDOW (XFRAME (this_frame)))))))
1454 { 1454 {
1455 /* We've found another frame whose minibuffer is on 1455 /* We've found another frame whose minibuffer is on
1456 this frame. */ 1456 this frame. */
1457 gui_error 1457 gui_error
1458 ("Attempt to delete a surrogate minibuffer frame", frame); 1458 ("Attempt to delete a surrogate minibuffer frame", frame);
1465 { 1465 {
1466 Lisp_Object frmcons, devcons, concons; 1466 Lisp_Object frmcons, devcons, concons;
1467 1467
1468 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) 1468 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
1469 { 1469 {
1470 Lisp_Object this = XCAR (frmcons); 1470 Lisp_Object this_frame = XCAR (frmcons);
1471 1471
1472 1472
1473 if (! EQ (this, frame)) 1473 if (! EQ (this_frame, frame))
1474 { 1474 {
1475 struct device *devcons_d = XDEVICE (XCAR (devcons)); 1475 struct device *devcons_d = XDEVICE (XCAR (devcons));
1476 if (EQ (frame, DEVMETH_OR_GIVEN (devcons_d, get_frame_parent, 1476 if (EQ (frame, DEVMETH_OR_GIVEN (devcons_d, get_frame_parent,
1477 (XFRAME (this)), 1477 (XFRAME (this_frame)),
1478 Qnil))) 1478 Qnil)))
1479 /* We've found a popup frame whose parent is this frame. */ 1479 /* We've found a popup frame whose parent is this frame. */
1480 gui_error 1480 gui_error
1481 ("Attempt to delete a frame with live popups", frame); 1481 ("Attempt to delete a frame with live popups", frame);
1482 } 1482 }
1713 1713
1714 set_console_last_nonminibuf_frame (con, Qnil); 1714 set_console_last_nonminibuf_frame (con, Qnil);
1715 1715
1716 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, con) 1716 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, con)
1717 { 1717 {
1718 Lisp_Object this; 1718 Lisp_Object this_frame;
1719 struct frame *f1; 1719 struct frame *f1;
1720 1720
1721 this = XCAR (frmcons); 1721 this_frame = XCAR (frmcons);
1722 f1 = XFRAME (this); 1722 f1 = XFRAME (this_frame);
1723 1723
1724 /* Consider only frames on the same console 1724 /* Consider only frames on the same console
1725 and only those with minibuffers. */ 1725 and only those with minibuffers. */
1726 if (FRAME_HAS_MINIBUF_P (f1)) 1726 if (FRAME_HAS_MINIBUF_P (f1))
1727 { 1727 {
1728 frame_with_minibuf = this; 1728 frame_with_minibuf = this_frame;
1729 if (FRAME_MINIBUF_ONLY_P (f1)) 1729 if (FRAME_MINIBUF_ONLY_P (f1))
1730 goto double_break_2; 1730 goto double_break_2;
1731 } 1731 }
1732 1732
1733 frame_on_same_console = this; 1733 frame_on_same_console = this_frame;
1734 } 1734 }
1735 double_break_2: 1735 double_break_2:
1736 1736
1737 if (!NILP (frame_on_same_console)) 1737 if (!NILP (frame_on_same_console))
1738 { 1738 {