diff options
| author | Martin Rudalics | 2011-06-06 15:57:49 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2011-06-06 15:57:49 +0200 |
| commit | 727e958ef0548f3d8ce02a4a971247f52cc548ce (patch) | |
| tree | 2b1eb83cafeb3b8c6b337d8fc41451db86f24e98 /src/window.h | |
| parent | bf60a96bc62eb465a482f5f95859a1147d0003d8 (diff) | |
| download | emacs-727e958ef0548f3d8ce02a4a971247f52cc548ce.tar.gz emacs-727e958ef0548f3d8ce02a4a971247f52cc548ce.zip | |
Move some window-related functions from frame.c to window.c.
* lisp.h: Move EXFUNS for Fframe_root_window,
Fframe_first_window and Fset_frame_selected_window to window.h.
* window.h: Move EXFUNS for Fframe_root_window,
Fframe_first_window and Fset_frame_selected_window here from
lisp.h.
* frame.c (Fwindow_frame, Fframe_first_window)
(Fframe_root_window, Fframe_selected_window)
(Fset_frame_selected_window): Move to window.c.
(Factive_minibuffer_window): Move to minibuf.c.
(Fother_visible_frames_p): New function.
* minibuf.c (Factive_minibuffer_window): Move here from frame.c.
* window.c (Fwindow_frame): Move here from frame.c. Accept any
window as argument.
(Fframe_root_window, Fframe_first_window)
(Fframe_selected_window): Move here from frame.c. Accept frame
or arbitrary window as argument. Update doc-strings.
(Fminibuffer_window): Move up in code.
(Fwindow_minibuffer_p): Move up in code and simplify.
(Fset_frame_selected_window): Move here from frame.c. Marginal
rewrite.
(Fselected_window, select_window, Fselect_window): Move up in
code. Minor doc-string fixes.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/window.h b/src/window.h index b1f6560445e..ac3335bfba4 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -844,11 +844,14 @@ struct glyph *get_phys_cursor_glyph (struct window *w); | |||
| 844 | extern Lisp_Object Qwindowp, Qwindow_live_p; | 844 | extern Lisp_Object Qwindowp, Qwindow_live_p; |
| 845 | extern Lisp_Object Vwindow_list; | 845 | extern Lisp_Object Vwindow_list; |
| 846 | 846 | ||
| 847 | EXFUN (Fselected_window, 0); | ||
| 848 | EXFUN (Fwindow_minibuffer_p, 1); | ||
| 849 | EXFUN (Fdelete_window, 1); | ||
| 850 | EXFUN (Fwindow_buffer, 1); | 847 | EXFUN (Fwindow_buffer, 1); |
| 851 | EXFUN (Fget_buffer_window, 2); | 848 | EXFUN (Fget_buffer_window, 2); |
| 849 | EXFUN (Fwindow_minibuffer_p, 1); | ||
| 850 | EXFUN (Fselected_window, 0); | ||
| 851 | EXFUN (Fframe_root_window, 1); | ||
| 852 | EXFUN (Fframe_first_window, 1); | ||
| 853 | EXFUN (Fset_frame_selected_window, 3); | ||
| 854 | EXFUN (Fdelete_window, 1); | ||
| 852 | EXFUN (Fset_window_configuration, 1); | 855 | EXFUN (Fset_window_configuration, 1); |
| 853 | EXFUN (Fcurrent_window_configuration, 1); | 856 | EXFUN (Fcurrent_window_configuration, 1); |
| 854 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); | 857 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); |