* src/window.h (Fwindow_frame): Declare.

diff --git a/src/ChangeLog b/src/ChangeLog
index e0a7645cf73c402a4cdd5c63bf28e35f0508f5e3..44dc1939db9e11930a580fda11f89f0722ea2325 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.h (Fwindow_frame): Declare.
+
 2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * alloc.c: Simplify handling of large-request failures (Bug#8800).
@@ -35,8 +39,8 @@
        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.
+       (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.
 
@@ -75,8 +79,8 @@
 
        * xselect.c (x_clipboard_manager_save): Remove redundant arg.
        (x_clipboard_manager_save): Add return value.
-       (x_clipboard_manager_error_1, x_clipboard_manager_error_2): New
-       error handlers.
+       (x_clipboard_manager_error_1, x_clipboard_manager_error_2):
+       New error handlers.
        (x_clipboard_manager_save_frame, x_clipboard_manager_save_all):
        Obey Vx_select_enable_clipboard_manager.  Catch errors in
        x_clipboard_manager_save (Bug#8779).
@@ -104,8 +108,8 @@
        (bidi_fetch_char, bidi_fetch_char_advance): New functions.
        (bidi_cache_search, bidi_cache_iterator_state)
        (bidi_paragraph_init, bidi_resolve_explicit, bidi_resolve_weak)
-       (bidi_level_of_next_char, bidi_move_to_visually_next): Support
-       character positions inside a run of characters covered by a
+       (bidi_level_of_next_char, bidi_move_to_visually_next):
+       Support character positions inside a run of characters covered by a
        display string.
        (bidi_paragraph_init, bidi_resolve_explicit_1)
        (bidi_level_of_next_char): Call bidi_fetch_char and
@@ -116,8 +120,8 @@
        definitions.
        (bidi_explicit_dir_char): Lookup character type in bidi_type_table,
        instead of using explicit *_CHAR codes.
-       (bidi_resolve_explicit, bidi_resolve_weak): Use
-       FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
+       (bidi_resolve_explicit, bidi_resolve_weak):
+       Use FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
        bidirectional text is supported only in multibyte buffers.
        (bidi_init_it): Accept additional argument FRAME_WINDOW_P and use
        it to initialize the frame_window_p member of struct bidi_it.
@@ -135,8 +139,8 @@
        (single_display_spec_intangible_p): Function deleted.
        (display_prop_intangible_p): Reimplement to call
        handle_display_spec instead of single_display_spec_intangible_p.
-       Accept 3 additional arguments needed by handle_display_spec.  This
-       fixes incorrect cursor motion across display property with complex
+       Accept 3 additional arguments needed by handle_display_spec.
+       This fixes incorrect cursor motion across display property with complex
        values: lists, `(when COND...)' forms, etc.
        (single_display_spec_string_p): Support property values that are
        lists with the argument STRING its top-level element.
@@ -153,8 +157,8 @@
        the display property will replace the characters it covers.
        (Fcurrent_bidi_paragraph_direction): Initialize the nchars and
        frame_window_p members of struct bidi_it.
-       (compute_display_string_pos, compute_display_string_end): New
-       functions.
+       (compute_display_string_pos, compute_display_string_end):
+       New functions.
        (push_it): Accept second argument POSITION, where pop_it should
        jump to continue iteration.
        (reseat_1): Initialize bidi_it.disp_pos.
@@ -165,8 +169,8 @@
        * dispextern.h (struct bidi_it): New member frame_window_p.
        (bidi_init_it): Update prototypes.
        (display_prop_intangible_p): Update prototype.
-       (compute_display_string_pos, compute_display_string_end): Declare
-       prototypes.
+       (compute_display_string_pos, compute_display_string_end):
+       Declare prototypes.
        (struct bidi_it): New members nchars and disp_pos.  ch_len is now
        EMACS_INT.
 

diff --git a/src/window.h b/src/window.h
index ac3335bfba49608f063b08f40e0f372d2a132922..96e30d98d243acbfc6541bc2b5c8c5a4270b6677 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -845,6 +845,7 @@ extern Lisp_Object Qwindowp, Qwindow_live_p;
 extern Lisp_Object Vwindow_list;
 
 EXFUN (Fwindow_buffer, 1);
+EXFUN (Fwindow_frame, 1);
 EXFUN (Fget_buffer_window, 2);
 EXFUN (Fwindow_minibuffer_p, 1);
 EXFUN (Fselected_window, 0);