merge trunk

diff --cc src/ChangeLog
index b09dae946f4fe134901c0ef1928a44bc7d698708,b14d6752bb97094eeef65d335d084f8cd0f569c1..42dede8e3007581df4579d3549a89634d6cf6f37
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,71 +1,76 @@@
 +2011-11-11  Johan Bockgård  <bojohan@gnu.org>
 +
 +      * xdisp.c (fill_composite_glyph_string): Always set s->face, to
 +      avoid a crash (bug#9496).
 +
+ 2011-11-09  Chong Yidong  <cyd@gnu.org>
+ 
+       * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)
+       (Fwindow_inside_absolute_pixel_edges): Only allow live windows.
+ 
+ 2011-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * s/gnu.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS (Bug#9926).
+ 
+ 2011-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Avoid some portability problems by eschewing 'extern inline' functions.
+       The trivial performance wins aren't worth the portability hassles; see
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>
+       et seq.
+       * dispextern.h (window_box, window_box_height, window_text_bottom_y)
+       (window_box_width, window_box_left, window_box_left_offset)
+       (window_box_right, window_box_right_offset): Undo previous change,
+       by removing the "extern"s.
+       * intervals.c (adjust_intervals_for_insertion)
+       (adjust_intervals_for_deletion): Undo previous change,
+       making these static again.
+       (offset_intervals, temp_set_point_both, temp_set_point)
+       (copy_intervals_to_string): No longer inline.
+       * xdisp.c (window_text_bottom_y, window_box_width)
+       (window_box_height, window_box_left_offset)
+       (window_box_right_offset, window_box_left, window_box_right)
+       (window_box): No longer inline.
+ 
+ 2011-11-08  Chong Yidong  <cyd@gnu.org>
+ 
+       * window.c (Fwindow_left_column, Fwindow_top_line): Doc fix.
+       (Fwindow_body_height, Fwindow_body_width): Move from Lisp.  Signal
+       an error if not a live window.
+       (Fwindow_total_width, Fwindow_total_height): Move from Lisp.
+       (Fwindow_total_size, Fwindow_body_size): Move to Lisp.
+ 
+ 2011-11-07  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * lisp.h (syms_of_abbrev): Remove declaration.
+       Reported by CHENG Gao <chenggao@royau.me>.
+ 
+ 2011-11-07  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * w32.c (check_windows_init_file): Don't look for term/w32-win.el
+       if Vpurify_flag is non-nil.  Fixes a crash when running w32 build
+       of temacs in GUI mode.
+ 
+ 2011-11-07  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * window.h: Declare delete_all_child_windows instead of
+       delete_all_subwindows.
+       * window.c (Fwindow_nest, Fset_window_nest)
+       (Fset_window_new_total, Fset_window_new_normal)
+       (Fwindow_resize_apply): Don't use term subwindow in doc-strings.
+       (delete_all_subwindows): Rename to delete_all_child_windows.
+       (Fdelete_other_windows_internal, Fset_window_configuration):
+       Call delete_all_child_windows instead of delete_all_subwindows.
+       * frame.c (delete_frame): Call delete_all_child_windows instead
+       of delete_all_subwindows.
+ 
+ 2011-11-07  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926).
+       This is also needed for porting to any host where GC_MARK_STACK is
+       not GC_MAKE_GCPROS_NOOPS.
+       (which_symbols): Use it.
+ 
  2011-11-07  Kenichi Handa  <handa@m17n.org>
  
        * coding.c (coding_set_destination): Check coding->src_pos only

diff --cc src/xdisp.c
Simple merge