diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/frame.c b/src/frame.c index cdf61c88990..b11a40a61a3 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -527,8 +527,9 @@ next_frame (frame, minibuf) | |||
| 527 | while (1) | 527 | while (1) |
| 528 | for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) | 528 | for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
| 529 | { | 529 | { |
| 530 | Lisp_Object f = XCONS (tail)->car; | 530 | Lisp_Object f; |
| 531 | 531 | ||
| 532 | f = XCONS (tail)->car; | ||
| 532 | if (passed) | 533 | if (passed) |
| 533 | { | 534 | { |
| 534 | /* Decide whether this frame is eligible to be returned. */ | 535 | /* Decide whether this frame is eligible to be returned. */ |
| @@ -586,8 +587,9 @@ prev_frame (frame, minibuf) | |||
| 586 | prev = Qnil; | 587 | prev = Qnil; |
| 587 | for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) | 588 | for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) |
| 588 | { | 589 | { |
| 589 | Lisp_Object f = XCONS (tail)->car; | 590 | Lisp_Object f; |
| 590 | 591 | ||
| 592 | f = XCONS (tail)->car; | ||
| 591 | if (XTYPE (f) != Lisp_Frame) | 593 | if (XTYPE (f) != Lisp_Frame) |
| 592 | abort (); | 594 | abort (); |
| 593 | 595 | ||
| @@ -692,8 +694,9 @@ other_visible_frames (f) | |||
| 692 | CONSP (frames); | 694 | CONSP (frames); |
| 693 | frames = XCONS (frames)->cdr) | 695 | frames = XCONS (frames)->cdr) |
| 694 | { | 696 | { |
| 695 | Lisp_Object this = XCONS (frames)->car; | 697 | Lisp_Object this; |
| 696 | 698 | ||
| 699 | this = XCONS (frames)->car; | ||
| 697 | /* Verify that the frame's window still exists | 700 | /* Verify that the frame's window still exists |
| 698 | and we can still talk to it. And note any recent change | 701 | and we can still talk to it. And note any recent change |
| 699 | in visibility. */ | 702 | in visibility. */ |
| @@ -829,14 +832,16 @@ but if the second optional argument FORCE is non-nil, you may do so.") | |||
| 829 | Lisp_Object frames; | 832 | Lisp_Object frames; |
| 830 | 833 | ||
| 831 | /* The last frame we saw with a minibuffer, minibuffer-only or not. */ | 834 | /* The last frame we saw with a minibuffer, minibuffer-only or not. */ |
| 832 | Lisp_Object frame_with_minibuf = Qnil; | 835 | Lisp_Object frame_with_minibuf; |
| 833 | 836 | ||
| 837 | frame_with_minibuf = Qnil; | ||
| 834 | for (frames = Vframe_list; | 838 | for (frames = Vframe_list; |
| 835 | CONSP (frames); | 839 | CONSP (frames); |
| 836 | frames = XCONS (frames)->cdr) | 840 | frames = XCONS (frames)->cdr) |
| 837 | { | 841 | { |
| 838 | Lisp_Object this = XCONS (frames)->car; | 842 | Lisp_Object this; |
| 839 | 843 | ||
| 844 | this = XCONS (frames)->car; | ||
| 840 | if (XTYPE (this) != Lisp_Frame) | 845 | if (XTYPE (this) != Lisp_Frame) |
| 841 | abort (); | 846 | abort (); |
| 842 | f = XFRAME (this); | 847 | f = XFRAME (this); |