Merge from trunk.

diff --cc src/ChangeLog
index 533f5cf43270b5ebb256cfe7a2b481721bc61ef8,2973ecc4b579fd2341808ed881a1c78e1ae2cfb4..17c27bc304853eb66c1d6bd72a2c934df4b525b0
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,22 -1,96 +1,115 @@@
- 2011-11-14  Paul Eggert  <eggert@cs.ucla.edu>
++2011-11-20  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Standardize on VIRT_ADDR_VARIES behavior; otherwise, valgrind
 +      does not work on some platforms.  Problem reported by Andreas Schwab in
 +      <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
 +      * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
 +      is set, removing the need for VIRT_ADDRESS_VARIES.
 +      (PURE_P): Use a more-efficient implementation that needs just one
 +      comparison, not two: on x86-64 with GCC 4.6.2, this cut down the
 +      number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge)
 +      to 4 (xorl, subq, cmpq, setbe).
 +      * alloc.c (pure): Always extern now, since that's the
 +      VIRT_ADDR_VARIES behavior.
 +      (PURE_POINTER_P): Use a single comparison, not two, for
 +      consistency with the new puresize.h.
 +      * lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed.
 +      * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
 +      Remove VIRT_ADDR_VARIES no longer needed.
 +
+ 2011-11-19  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)
+       (erase_phys_cursor, update_window_cursor, show_mouse_face)
+       (cursor_in_mouse_face_p): If the cursor position is out of bounds,
+       behave as if the cursor position were at the window margin.
+ 
+       * window.c (get_phys_cursor_glyph): If the window is hscrolled,
+       and the cursor position is out of bounds, behave as if the cursor
+       position were at the window margin.  (Bug#10075)
+ 
+ 2011-11-18  Chong Yidong  <cyd@gnu.org>
+ 
+       * window.c (Fwindow_combination_limit): Make first argument
+       non-optional, since it is meaningless for live windows like the
+       selected window.
+ 
+ 2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.
+ 
+ 2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * intervals.c: Fix grafting over the whole buffer (bug#10071).
+       (graft_intervals_into_buffer): Simplify.
+ 
+ 2011-11-18  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the
+       hash values of the two rows.
+       (copy_row_except_pointers): Preserve the used[] arrays and the
+       hash values of the two rows.  (Bug#10035)
+       (add_row_entry): Add xassert to verify that ROW's hash code is valid.
+ 
+       * xdisp.c (row_hash): New function, body extracted from
+       compute_line_metrics.
+       (compute_line_metrics): Call row_hash, instead of computing the
+       hash code inline.
+ 
+       * dispnew.c (verify_row_hash): Call row_hash for computing the
+       hash code of a row, instead of duplicating code from xdisp.c.
+ 
+       * dispextern.h (row_hash): Add prototype.
+ 
+ 2011-11-18  Tassilo Horn  <tassilo@member.fsf.org>
+ 
+       * frame.c (delete_frame): Don't delete the terminal when the last
+       X frame is closed if emacs is built with GTK toolkit.
+ 
+ 2011-11-17  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * window.c (syms_of_window) <window-combination-resize>: Fix typo.
+ 
+ 2011-11-17  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * window.c (Vwindow_splits): Rename to
+       Vwindow_combination_resize.  Suggested by Juri Linkov.
+       (Fsplit_window_internal): Use Vwindow_combination_resize instead
+       of Vwindow_splits.
+ 
+ 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * nsfns.m (Fns_font_name):
+       * window.c (syms_of_window) <window-combination-limit>: Fix typos.
+ 
+ 2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * window.h (window): Rename slot "nest" to "combination_limit".
+       * window.c (Fwindow_nest): Rename to Fwindow_combination_limit.
+       (Fset_window_nest): Rename to Fset_window_combination_limit.
+       (Vwindow_nest): Rename to Vwindow_combination_limit.
+       (recombine_windows, make_parent_window, make_window)
+       (Fsplit_window_internal, saved_window)
+       (Fset_window_configuration, save_window_save): Rename all
+       occurrences of window_nest to window_combination_limit.
+ 
+ 2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * image.c (imagemagick_load_image): Fix typo.
+ 
+ 2011-11-14  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (display_line): Move the call to
+       highlight_trailing_whitespace before the call to
+       compute_line_metrics, since the latter needs to see the final
+       faces of all the glyphs to compute ROW's hash value.  Fixes
+       assertion violations in row_equal_p.  (Bug#10035)
+ 
+ 2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * w32proc.c (reader_thread): Don't check pending input if cp->fd < 0,
+       just return (bug#10044).
+ 
  2011-11-12  Eli Zaretskii  <eliz@gnu.org>
  
        * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs

diff --cc src/alloc.c
Simple merge

diff --cc src/lisp.h
Simple merge