merge trunk

diff --cc src/ChangeLog
index 21d13a04e779865b0cf4992a41c79094f64c92b7,9061b08220bff790e42df479cda5d92d978fc73f..b845eeb3ceb2c40482db185adf30b049ece0326b
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,55 +1,60 @@@
 +2012-10-17  Kenichi Handa  <handa@gnu.org>
 +
 +      * xdisp.c (reseat_1): Make the information stored in it->cmp_it
 +      invalidate.
 +
+ 2012-10-17  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       * buffer.c (Fkill_buffer): When unchaining the marker,
+       reset its buffer pointer to NULL (Bug#12652).
+ 
+ 2012-10-17  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       Do not verify indirection counters of killed buffers (Bug#12579).
+       * buffer.h (BUFFER_CHECK_INDIRECTION): New macro.
+       * buffer.c (compact_buffer, set_buffer_internal_1): Use it.
+ 
+ 2012-10-16  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       * alloc.c (Fmake_byte_code): Fix typo in comment.
+       * print.c (print_interval): Define as static to match prototype.
+       * indent.c (disptab_matches_widthtab, recompute_width_table):
+       Convert to eassert.
+ 
+ 2012-10-16  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       * editfns.c (get_system_name): Remove.
+       * lisp.h (get_system_name): Remove prototype.
+       * xrdb.c (getenv, getpwuid, getpwnam): Remove prototypes.
+       (get_environ_db): Use Vsystem_name.  Avoid call to strlen.
+ 
+ 2012-10-15  Daniel Colascione  <dancol@dancol.org>
+ 
+       * dbusbind.c: Add comment explaining reason for previous change.
+ 
+ 2012-10-15  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * window.c (Fwindow_end): Rewrite check whether cached position
+       can be used (Bug#12600).
+       (resize_frame_windows, grow_mini_window, shrink_mini_window):
+       Set windows_or_buffers_changed.
+ 
+ 2012-10-15  Daniel Colascione  <dancol@dancol.org>
+ 
+       * dbusbind.c: Fix cygw32 build break when compiling with dbus
+       enabled by undefining the symbol "interface", which the platform
+       headers define to something incompatible.
+ 
+ 2012-10-14  Daniel Colascione  <dancol@dancol.org>
+ 
+       * image.c (init_tiff_functions, init_imagemagick_functions)
+       (init_svg_functions): Fix cygw32 build break by using these
+       functions only when WINDOWSNT _and_ HAVE_NTGUI.
+ 
+ 2012-10-14  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsterm.m (ns_select): Count fd:s in writefs also (Bug#12422).
+ 
  2012-10-13  Jan Djärv  <jan.h.d@swipnet.se>
  
        * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612).