Mercurial > emacs
comparison src/window.c @ 3688:b9f27ed0228c
(Fdelete_window): Make `frame' a FRAME_PTR and use as such.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 12 Jun 1993 17:06:34 +0000 |
parents | 01941fa99c91 |
children | ccb9c93aac80 |
comparison
equal
deleted
inserted
replaced
3687:54381151027d | 3688:b9f27ed0228c |
---|---|
698 | 698 |
699 windows_or_buffers_changed++; | 699 windows_or_buffers_changed++; |
700 | 700 |
701 /* Are we trying to delete any frame's selected window? */ | 701 /* Are we trying to delete any frame's selected window? */ |
702 { | 702 { |
703 Lisp_Object frame = WINDOW_FRAME (XWINDOW (window)); | 703 FRAME_PTR frame = WINDOW_FRAME (XWINDOW (window)); |
704 | 704 |
705 if (EQ (window, FRAME_SELECTED_WINDOW (XFRAME (frame)))) | 705 if (EQ (window, FRAME_SELECTED_WINDOW (frame))) |
706 { | 706 { |
707 Lisp_Object alternative = Fnext_window (window, Qlambda, Qnil); | 707 Lisp_Object alternative = Fnext_window (window, Qlambda, Qnil); |
708 | 708 |
709 /* If we're about to delete the selected window on the | 709 /* If we're about to delete the selected window on the |
710 selected frame, then we should use Fselect_window to select | 710 selected frame, then we should use Fselect_window to select |
712 delete the selected window on any other frame, we shouldn't do | 712 delete the selected window on any other frame, we shouldn't do |
713 anything but set the frame's selected_window slot. */ | 713 anything but set the frame's selected_window slot. */ |
714 if (EQ (window, selected_window)) | 714 if (EQ (window, selected_window)) |
715 Fselect_window (alternative); | 715 Fselect_window (alternative); |
716 else | 716 else |
717 FRAME_SELECTED_WINDOW (XFRAME (frame)) = alternative; | 717 FRAME_SELECTED_WINDOW (frame) = alternative; |
718 } | 718 } |
719 } | 719 } |
720 | 720 |
721 tem = p->buffer; | 721 tem = p->buffer; |
722 /* tem is null for dummy parent windows | 722 /* tem is null for dummy parent windows |