Merge from trunk.

27 files changed, 274 insertions, 111 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b573f8c1476..007a73f7988 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,103 @@
+2012-10-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/w32.$(O)): 
+        ($(BLD)/vm-limit.$(O)): 
+        ($(BLD)/term.$(O)): 
+        ($(BLD)/unexw32.$(O)): 
+        ($(BLD)/fileio.$(O)): 
+        ($(BLD)/dispnew.$(O)): Update dependencies.
+
+        * w32term.h (w32_initialize_display_info, initialize_w32_display):
+        Add prototypes.
+
+        * w32proc.c: Include ctype.h.
+
+        * w32.h (init_environment, check_windows_init_file)
+        (syms_of_ntproc, syms_of_ntterm, dostounix_filename)
+        (unixtodos_filename, init_winsock, srandom, random, sys_pipe)
+        (set_process_dir, sys_spawnve, register_child, sys_sleep, getwd)
+        (sys_link): Add prototypes.
+
+        * w32.c: Include w32select.h.
+        (sys_access, e_malloc, sys_select): Add prototypes.
+        (emacs_gnutls_pull): 'timeout' is now EMACS_TIME, not struct timeval.
+
+        * vm-limit.c [WINDOWSNT]: Include w32heap.h.
+
+        * unexw32.c: Include lisp.h and w32.h.
+
+        * term.c [WINDOWSNT]: Include w32term.h.
+
+        * process.c [WINDOWSNT]: Add prototype of sys_select.
+
+        * fileio.c [WINDOWSNT]: Include w32.h.
+
+        * dispnew.c [WINDOWSNT]: Include w32.h.
+
+        * cygw32.c (Fcygwin_convert_path_to_windows)
+        (Fcygwin_convert_path_from_windows): Use EQ to compare 2
+        Lisp_Object values.  (Bug#12661)
+
+        * w32fns.c (w32_msg_pump): Use XIL instead of casting an integer
+        to Lisp_Object.  (Bug#12661)
+
+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).
@@ -53,8 +153,7 @@
         a file exists.  This avoids expensive system calls on MS-Windows.
         (Bug#12587)
 
-        * w32.c (init_environment): Call 'check_existing' instead of
-        'stat'.
+        * w32.c (init_environment): Call 'check_existing' instead of 'stat'.
 
         * lread.c (openp) [WINDOWSNT]: Call 'access' instead of 'stat' to
         determine whether a file exists and is not a directory.
@@ -194,7 +293,7 @@
         * nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles
         caching.
         (nsfont_open): Remove setting of Vfonts_in_cache.
-        (syms_of_nsfont): Remove initialization of Vfonts_in_cache
+        (syms_of_nsfont): Remove initialization of Vfonts_in_cache.
 
 2012-10-09  Eli Zaretskii  <eliz@gnu.org>
 
@@ -261,7 +360,7 @@
         * w32select.h (HAVE_W32SELECT): Remove.
 
         * w32select.c, w32proc.c, w32menu.c, w32console.c, w32.c: Include
-        w32common.h instead of w32heap.h
+        w32common.h instead of w32heap.h.
 
         * w32heap.h (ROUND_UP, ROUND_DOWN, get_page_size)
         (get_allocation_unit, get_processor_type, get_w32_major_version)
@@ -272,8 +371,8 @@
 
         * w32heap.c: Include w32common.h.
         (sysinfo_cache, syspage_mask, osinfo_cache, w32_major_version)
-        (w32_minor_version, w32_build_number, w32_subtype): Remove
-        duplicate definitions.
+        (w32_minor_version, w32_build_number, w32_subtype):
+        Remove duplicate definitions.
 
         * w32fns.c: Include w32common.h; include w32heap.h only in
         WINDOWSNT.
@@ -384,7 +483,7 @@
         Cygwin builds.  Remove w32select declarations.
 
         * w32console.c (w32_sys_ring_bell, Fset_message_beep): Move to
-        w32fns.c. w32console.c is WINDOWSNT-only.
+        w32fns.c.  w32console.c is WINDOWSNT-only.
 
         * w32fns.c: Include cygw32.h or w32.h depending on CYGWIN; more
         NTGUI_UNICODE tweaks.  (See above.) Change _snprintf to the more
@@ -460,6 +559,39 @@
         but it still has blocs in it, don't return it to the system,
         instead of aborting.  (Bug#12402)
 
+2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506).
+
+        * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of
+        MAC_OS_X_VERSION_10_6.
+        (syms_of_nsterm): Remove comment about Panther and above for
+        ns-antialias-text.
+        * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove.
+        (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4.
+        (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3.
+
+        * nsselect.m (ns_string_from_pasteboard): Remove check for >=
+        MAC_OS_X_VERSION_10_4.
+
+        * nsmenu.m (fillWithWidgetValue:): Remove code for <
+        MAC_OS_X_VERSION_10_2.
+
+        * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger.
+
+        * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4.
+        (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4.
+
+        * nsterm.m (ns_in_resize): Remove (Bug#12479).
+        (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove.
+        (ns_clear_frame, sendEvent, windowDidResize, drawRect:):
+        Remove ns_in_resize check.
+        (ns_clear_frame_area): Remove resize handle code.
+
+        * nsfns.m (ns_in_resize): Remove.
+        (x_set_icon_name, ns_set_name, ns_set_name_as_filename): Remove
+        ns_in_resize check.
+
 2012-10-07  Eli Zaretskii  <eliz@gnu.org>
 
         * w32term.h (WM_EMACS_FILENOTIFY): New custom message.
@@ -494,39 +626,6 @@
 
         * alloc.c (NSTATICS): Enlarge to 0x660.
 
-2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
-
-        * nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506).
-
-        * nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of
-        MAC_OS_X_VERSION_10_6.
-        (syms_of_nsterm): Remove comment about Panther and above for
-        ns-antialias-text.
-        * nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove.
-        (EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4.
-        (struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3.
-
-        * nsselect.m (ns_string_from_pasteboard): Remove check for >=
-        MAC_OS_X_VERSION_10_4.
-
-        * nsmenu.m (fillWithWidgetValue:): Remove code for <
-        MAC_OS_X_VERSION_10_2.
-
-        * nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger.
-
-        * nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4.
-        (ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4.
-
-        * nsterm.m (ns_in_resize): Remove (Bug#12479).
-        (ns_resize_handle_rect, mouseDown, mouseUp, mouseDragged): Remove.
-        (ns_clear_frame, sendEvent, windowDidResize, drawRect:): Remove
-        ns_in_resize check.
-        (ns_clear_frame_area): Remove resize handle code.
-
-        * nsfns.m (ns_in_resize): Remove.
-        (x_set_icon_name, ns_set_name, ns_set_name_as_filename):  Remove
-        ns_in_resize check.
-
 2012-10-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Improve sys_siglist detection.
@@ -553,7 +652,7 @@
         (initFrameFromEmacs:): tbar_height renamed tibar_height.
         (windowDidEnterFullScreen:): Toggle toolbar for fullscreen to fix
         error in drawing background.
-        (toggleFullScreen:): Remove comment. Rearrange calls.
+        (toggleFullScreen:): Remove comment.  Rearrange calls.
         Set toolbar values to zero, save old height in tobar_height.
         Restore tool bar height when leaving fullscreen.
         (canBecomeMainWindow): New function.
@@ -567,8 +666,8 @@
         * w32proc.c (stop_timer_thread): Fix declaration of 'err'.
 
         * w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so
-        that time stamps of directories could also be changed.  Don't
-        request the too broad GENERIC_WRITE, only the more restrictive
+        that time stamps of directories could also be changed.
+        Don't request the too broad GENERIC_WRITE, only the more restrictive
         FILE_WRITE_ATTRIBUTES access rights.
 
         * fileio.c (Fset_file_times): Special-case ignoring errors for
@@ -976,7 +1075,7 @@
         Call setCollectionBehavior if NEW_STYLE_FS.  Initialize bwidth and
         tbar_height.
         (windowWillUseStandardFrame:defaultFrame:): Update frame parameter
-        fullscreen. Set maximized_width/height.  Act on next_maximized.
+        fullscreen.  Set maximized_width/height.  Act on next_maximized.
 
         * nsterm.h (MAC_OS_X_VERSION_10_7, MAC_OS_X_VERSION_10_8): New.
         (EmacsView): Add variables for fullscreen.
@@ -1632,7 +1731,7 @@
 2012-09-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         * w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0.
-        Ignore 'expected'. See Eli Zaretskii in
+        Ignore 'expected'.  See Eli Zaretskii in
         <http://bugs.gnu.org/12471#8> (last line).
 
         * frame.c (read_integer): Remove.  All uses replaced by strtol/strtoul.
@@ -1699,7 +1798,7 @@
         (bytes_used_when_full, emacs_blocked_free, emacs_blocked_malloc)
         (emacs_blocked_realloc, reset_malloc_hooks, uninterrupt_malloc):
         [!SYSTEM_MALLOC && !SYNC_INPUT]:
-        Remove. All uses removed.
+        Remove.  All uses removed.
         (MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): Use a different
         implementation, one that depends on whether the new macro
         XMALLOC_BLOCK_INPUT_CHECK is defined, not on whether SYNC_INPUT
@@ -1989,7 +2088,7 @@
         * alloc.c (discard_killed_buffers): New function.
         (mark_object): Use it for deleted windows and frames.
         (mark_object): If symbol's value is set up for a killed buffer
-        or deleted frame, restore it's global binding.
+        or deleted frame, restore its global binding.
         * data.c (swap_in_global_binding): Add GC notice.
         (swap_in_symval_forwarding): Use convenient set_blv_where.
         * window.c (wset_next_buffers, wset_prev_buffers): Move ...
@@ -4296,7 +4395,7 @@
 
         * nsterm.m (ns_set_vertical_scroll_bar, ns_redeem_scroll_bar)
         (EmacsWindow-accessibilityAttributeValue, EmacsScroller-initFrame:)
-        (EmacsScroller-dealloc):  Adjust to use WVAR.  (Bug#12114)
+        (EmacsScroller-dealloc): Adjust to use WVAR.  (Bug#12114)
         * nsfns.m (ns_set_name_as_filename): Likewise.
         * nsmenu.m (ns_update_menubar): Likewise.
         * nsselect.m (symbol_to_nsstring): Adjust to use SVAR.
@@ -6392,7 +6491,7 @@
         Fix block vector allocation code to allow VECTOR_BLOCK_SIZE
         values which aren't power of 2.
         * alloc.c (VECTOR_FREE_LIST_SIZE_MASK): New macro.
-        Verify it's value and the value of VECTOR_BLOCK_SIZE.  Adjust users
+        Verify its value and the value of VECTOR_BLOCK_SIZE.  Adjust users
         accordingly.
 
 2012-07-03  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -7561,7 +7660,7 @@
         bitfields where appropriate, remove unused fields.
         * window.h (struct window): Remove unused 'last_mark_x' and
         'last_mark_y' fields.  Rename 'mini_p' field to 'mini',
-        change it's type from Lisp_Object to bitfield.
+        change its type from Lisp_Object to bitfield.
         Change type of 'force_start', 'optional_new_start',
         'last_had_star', 'update_mode_line' and 'start_at_line_beg'
         fields from Lisp_Object to bitfield.  Adjust users accordingly.
diff --git a/src/alloc.c b/src/alloc.c
index 4fd659bd001..f2dd7c8cee7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3100,7 +3100,7 @@ usage: (make-byte-code ARGLIST BYTE-CODE CONSTANTS DEPTH &optional DOCSTRING INT
   ptrdiff_t i;
   register struct Lisp_Vector *p;
 
-  /* We used to purecopy everything here, if purify-flga was set.  This worked
+  /* We used to purecopy everything here, if purify-flag was set.  This worked
      OK for Emacs-23, but with Emacs-24's lexical binding code, it can be
      dangerous, since make-byte-code is used during execution to build
      closures, so any closure built during the preload phase would end up
diff --git a/src/buffer.c b/src/buffer.c
index 861a89b5a0f..0b3dde27968 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1663,18 +1663,11 @@ No argument or nil as argument means do this for the current buffer.  */)
 void
 compact_buffer (struct buffer *buffer)
 {
-  /* Verify indirection counters.  */
-  if (buffer->base_buffer)
-    {
-      eassert (buffer->indirections == -1);
-      eassert (buffer->base_buffer->indirections > 0);
-    }
-  else
-    eassert (buffer->indirections >= 0);
+  BUFFER_CHECK_INDIRECTION (buffer);
 
   /* Skip dead buffers, indirect buffers and buffers
      which aren't changed since last compaction.  */
-  if (!NILP (buffer->INTERNAL_FIELD (name))
+  if (BUFFER_LIVE_P (buffer)
       && (buffer->base_buffer == NULL)
       && (buffer->text->compact != buffer->text->modiff))
     {
@@ -1888,19 +1881,20 @@ cleaning up all windows currently displaying the buffer to be killed. */)
 
   if (b->base_buffer)
     {
-      { /* Unchain all markers that belong to this indirect buffer.
-           Don't unchain the markers that belong to the base buffer
-           or its other indirect buffers.  */
-        struct Lisp_Marker **mp;
-        for (mp = &BUF_MARKERS (b); *mp; )
-          {
-            struct Lisp_Marker *m = *mp;
-            if (m->buffer == b)
+      /* Unchain all markers that belong to this indirect buffer.
+         Don't unchain the markers that belong to the base buffer
+         or its other indirect buffers.  */
+      struct Lisp_Marker **mp = &BUF_MARKERS (b);
+      while ((m = *mp))
+        {
+          if (m->buffer == b)
+            {
+              m->buffer = NULL;
               *mp = m->next;
-            else
-              mp = &m->next;
-          }
-      }
+            }
+          else
+            mp = &m->next;
+        }
     }
   else
     {
@@ -2114,6 +2108,8 @@ set_buffer_internal_1 (register struct buffer *b)
   if (current_buffer == b)
     return;
 
+  BUFFER_CHECK_INDIRECTION (b);
+  
   old_buf = current_buffer;
   current_buffer = b;
   last_known_column_point = -1;   /* invalidate indentation cache */
diff --git a/src/buffer.h b/src/buffer.h
index d18ef30ea38..9e0e9eef0b1 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -963,6 +963,22 @@ bset_width_table (struct buffer *b, Lisp_Object val)
 
 #define BUFFER_LIVE_P(b) (!NILP (BVAR (b, name)))
 
+/* Verify indirection counters.  */
+
+#define BUFFER_CHECK_INDIRECTION(b)                     \
+  do {                                                  \
+    if (BUFFER_LIVE_P (b))                              \
+    {                                                   \
+      if (b->base_buffer)                               \
+        {                                               \
+          eassert (b->indirections == -1);              \
+          eassert (b->base_buffer->indirections > 0);   \
+        }                                               \
+      else                                              \
+        eassert (b->indirections >= 0);                 \
+    }                                                   \
+  } while (0)
+
 /* Chain of all buffers, including killed ones.  */
 
 extern struct buffer *all_buffers;
diff --git a/src/cygw32.c b/src/cygw32.c
index c45a45648e9..8f63461da2a 100644
--- a/src/cygw32.c
+++ b/src/cygw32.c
@@ -145,7 +145,7 @@ DEFUN ("cygwin-convert-path-to-windows",
   (Lisp_Object path, Lisp_Object absolute_p)
 {
   return from_unicode (
-    conv_filename_to_w32_unicode (path, absolute_p == Qnil ? 0 : 1));
+    conv_filename_to_w32_unicode (path, EQ (absolute_p, Qnil) ? 0 : 1));
 }
 
 DEFUN ("cygwin-convert-path-from-windows",
@@ -156,7 +156,7 @@ DEFUN ("cygwin-convert-path-from-windows",
   (Lisp_Object path, Lisp_Object absolute_p)
 {
   return conv_filename_from_w32_unicode (to_unicode (path, &path),
-                                         absolute_p == Qnil ? 0 : 1);
+                                         EQ (absolute_p, Qnil) ? 0 : 1);
 }
 
 void
diff --git a/src/dbusbind.c b/src/dbusbind.c
index c2eefd605bb..08f34f47042 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -32,6 +32,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DBUS_NUM_MESSAGE_TYPES 5
 #endif
 
+
+/* Some platforms define the symbol "interface", but we want to use it
+ * as a variable name below.  */
+
+#ifdef interface
+#undef interface
+#endif
+
 
 /* Subroutines.  */
 static Lisp_Object Qdbus_init_bus;
diff --git a/src/dispnew.c b/src/dispnew.c
index 0956e3f2905..fa24408aa43 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -60,6 +60,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #if defined (HAVE_TERM_H) && defined (GNU_LINUX)
 #include <term.h>               /* for tgetent */
 #endif
+
+#ifdef WINDOWSNT
+#include "w32.h"
+#endif
 
 /* Structure to pass dimensions around.  Used for character bounding
    boxes, glyph matrix dimensions and alike.  */
diff --git a/src/editfns.c b/src/editfns.c
index 19fad7130a7..c5d4ed295ab 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1339,15 +1339,6 @@ DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
   return Vsystem_name;
 }
 
-const char *
-get_system_name (void)
-{
-  if (STRINGP (Vsystem_name))
-    return SSDATA (Vsystem_name);
-  else
-    return "";
-}
-
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
        doc: /* Return the process ID of Emacs, as a number.  */)
   (void)
diff --git a/src/fileio.c b/src/fileio.c
index e3a91c2c9da..d47d7dd9e0b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -53,6 +53,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <windows.h>
 #include <fcntl.h>
 #include <sys/file.h>
+#include "w32.h"
 #endif /* not WINDOWSNT */
 
 #ifdef MSDOS
diff --git a/src/image.c b/src/image.c
index d52c3a29a27..538ae2b7772 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6577,7 +6577,7 @@ static const struct image_keyword tiff_format[TIFF_LAST] =
   {":index",            IMAGE_NON_NEGATIVE_INTEGER_VALUE,       0}
 };
 
-#ifdef HAVE_NTGUI
+#if defined HAVE_NTGUI && defined WINDOWSNT
 static bool init_tiff_functions (void);
 #else
 #define init_tiff_functions NULL
@@ -7529,7 +7529,7 @@ static struct image_keyword imagemagick_format[IMAGEMAGICK_LAST] =
     {":crop",           IMAGE_DONT_CHECK_VALUE_TYPE,            0}
   };
 
-#ifdef HAVE_NTGUI
+#if defined HAVE_NTGUI && defined WINDOWSNT
 static bool init_imagemagick_functions (void);
 #else
 #define init_imagemagick_functions NULL
@@ -8083,7 +8083,7 @@ static const struct image_keyword svg_format[SVG_LAST] =
   {":background",       IMAGE_STRING_OR_NIL_VALUE,              0}
 };
 
-#ifdef HAVE_NTGUI
+#if defined HAVE_NTGUI && defined WINDOWSNT
 static bool init_svg_functions (void);
 #else
 #define init_svg_functions NULL
diff --git a/src/indent.c b/src/indent.c
index 81a63455ecb..bbc944d2518 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -119,8 +119,7 @@ disptab_matches_widthtab (struct Lisp_Char_Table *disptab, struct Lisp_Vector *w
 {
   int i;
 
-  if (widthtab->header.size != 256)
-    emacs_abort ();
+  eassert (widthtab->header.size == 256);
 
   for (i = 0; i < 256; i++)
     if (character_width (i, disptab)
@@ -141,8 +140,7 @@ recompute_width_table (struct buffer *buf, struct Lisp_Char_Table *disptab)
   if (!VECTORP (BVAR (buf, width_table)))
     bset_width_table (buf, Fmake_vector (make_number (256), make_number (0)));
   widthtab = XVECTOR (BVAR (buf, width_table));
-  if (widthtab->header.size != 256)
-    emacs_abort ();
+  eassert (widthtab->header.size == 256);
 
   for (i = 0; i < 256; i++)
     XSETFASTINT (widthtab->contents[i], character_width (i, disptab));
diff --git a/src/lisp.h b/src/lisp.h
index 113ae16fc14..b9e78385313 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3127,7 +3127,6 @@ extern Lisp_Object make_buffer_string (ptrdiff_t, ptrdiff_t, bool);
 extern Lisp_Object make_buffer_string_both (ptrdiff_t, ptrdiff_t, ptrdiff_t,
                                             ptrdiff_t, bool);
 extern void init_editfns (void);
-const char *get_system_name (void);
 extern void syms_of_editfns (void);
 extern void set_time_zone_rule (const char *);
 
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 3e817fd58ca..7cb6667c7ea 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -736,6 +736,7 @@ $(BLD)/dispnew.$(O) : \
         $(SRC)/disptab.h \
         $(SRC)/indent.h \
         $(SRC)/termchar.h \
+        $(SRC)/w32.h \
         $(NT_INC)/unistd.h \
         $(BUFFER_H) \
         $(CHARACTER_H) \
@@ -833,6 +834,7 @@ $(BLD)/fileio.$(O) : \
         $(SRC)/fileio.c \
         $(SRC)/blockinput.h \
         $(SRC)/commands.h \
+        $(SRC)/w32.h \
         $(NT_INC)/pwd.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/stat.h \
@@ -1174,6 +1176,7 @@ $(BLD)/w32.$(O) : \
         $(SRC)/w32.h \
         $(SRC)/w32common.h \
         $(SRC)/w32heap.h \
+        $(SRC)/w32select.h \
         $(NT_INC)/pwd.h \
         $(NT_INC)/sys/file.h \
         $(NT_INC)/sys/time.h \
@@ -1429,6 +1432,7 @@ $(BLD)/term.$(O) : \
         $(SYSSIGNAL_H) \
         $(SYSTTY_H) \
         $(TERMHOOKS_H) \
+        $(W32TERM_H) \
         $(WINDOW_H)
 
 $(BLD)/terminal.$(O) : \
@@ -1469,13 +1473,16 @@ $(BLD)/undo.$(O) : \
 $(BLD)/unexw32.$(O) : \
         $(SRC)/unexw32.c \
         $(SRC)/unexec.h \
+        $(SRC)/w32.h \
         $(SRC)/w32common.h \
         $(SRC)/w32heap.h \
+        $(LISP_H) \
         $(CONFIG_H)
 
 $(BLD)/vm-limit.$(O) : \
         $(SRC)/vm-limit.c \
         $(SRC)/mem-limits.h \
+        $(SRC)/w32heap.h \
         $(NT_INC)/unistd.h \
         $(CONFIG_H) \
         $(LISP_H)
diff --git a/src/nsterm.m b/src/nsterm.m
index 98dd0a8aab1..dfc84db50f7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3444,7 +3444,10 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
 /*  NSTRACE (ns_select); */
 
   for (k = 0; readfds && k < nfds+1; k++)
-    if (FD_ISSET(k, readfds)) ++nr;
+    {
+      if (FD_ISSET(k, readfds)) ++nr;
+      if (FD_ISSET(k, writefds)) ++nr;
+    }
 
   if (NSApp == nil
       || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))
diff --git a/src/print.c b/src/print.c
index 49b491faec8..ccf0e8ed7cc 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2075,7 +2075,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
 /* Print a description of INTERVAL using PRINTCHARFUN.
    This is part of printing a string that has text properties.  */
 
-void
+static void
 print_interval (INTERVAL interval, Lisp_Object printcharfun)
 {
   if (NILP (interval->plist))
diff --git a/src/process.c b/src/process.c
index d45a2c6e8e0..307e82819d6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -125,6 +125,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xgselect.h"
 #endif
 
+#ifdef WINDOWSNT
+extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
+                       EMACS_TIME *, void *);
+#endif
+
 #ifndef WNOHANG
 # undef waitpid
 # define waitpid(pid, status, options) wait (status)
diff --git a/src/term.c b/src/term.c
index acce9c0548c..f7c87b7608d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -66,6 +66,7 @@ static int been_here = -1;
 /* The name of the default console device.  */
 #ifdef WINDOWSNT
 #define DEV_TTY  "CONOUT$"
+#include "w32term.h"
 #else
 #define DEV_TTY  "/dev/tty"
 #endif
diff --git a/src/unexw32.c b/src/unexw32.c
index 82671d0f120..1e591a78b73 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -22,7 +22,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "unexec.h"
+#include "lisp.h"
 #include "w32common.h"
+#include "w32.h"
 
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 3020b84858a..2a71e88695a 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -85,6 +85,8 @@ get_lim_data (void)
 #else /* not USG */
 #ifdef WINDOWSNT
 
+#include "w32heap.h"
+
 static void
 get_lim_data (void)
 {
diff --git a/src/w32.c b/src/w32.c
index babbcc6df9f..5ac1bc3eb7c 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -175,6 +175,7 @@ typedef struct _REPARSE_DATA_BUFFER {
 #include "ndir.h"
 #include "w32common.h"
 #include "w32heap.h"
+#include "w32select.h"
 #include "systime.h"
 #include "dispextern.h"         /* for xstrcasecmp */
 #include "coding.h"             /* for Vlocale_coding_system */
@@ -198,6 +199,12 @@ static int enable_privilege (LPCTSTR, BOOL, TOKEN_PRIVILEGES *);
 static int restore_privilege (TOKEN_PRIVILEGES *);
 static BOOL WINAPI revert_to_self (void);
 
+extern int sys_access (const char *, int);
+extern void *e_malloc (size_t);
+extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
+                       EMACS_TIME *, void *);
+
+
 
 /* Initialization states.
 
@@ -6961,7 +6968,7 @@ emacs_gnutls_pull (gnutls_transport_ptr_t p, void* buf, size_t sz)
 {
   int n, sc, err;
   SELECT_TYPE fdset;
-  struct timeval timeout;
+  EMACS_TIME timeout;
   struct Lisp_Process *process = (struct Lisp_Process *)p;
   int fd = process->infd;
 
@@ -6977,8 +6984,7 @@ emacs_gnutls_pull (gnutls_transport_ptr_t p, void* buf, size_t sz)
       if (err == EWOULDBLOCK)
         {
           /* Set a small timeout.  */
-          timeout.tv_sec = 1;
-          timeout.tv_usec = 0;
+          timeout = make_emacs_time (1, 0);
           FD_ZERO (&fdset);
           FD_SET ((int)fd, &fdset);
 
diff --git a/src/w32.h b/src/w32.h
index c4cfdf5fedd..8309a3cc23d 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -146,6 +146,28 @@ extern int _sys_wait_accept (int fd);
 extern Lisp_Object QCloaded_from;
 extern HMODULE w32_delayed_load (Lisp_Object);
 
+extern void init_environment (char **);
+extern void check_windows_init_file (void);
+extern void syms_of_ntproc (void);
+extern void syms_of_ntterm (void);
+extern void dostounix_filename (register char *);
+extern void unixtodos_filename (register char *);
+extern BOOL init_winsock (int load_now);
+extern void srandom (int);
+extern int random (void);
+
+extern int sys_pipe (int *);
+
+extern void set_process_dir (char *);
+extern int sys_spawnve (int, char *, char **, char **);
+extern void register_child (int, int);
+
+extern void sys_sleep (int);
+extern char *getwd (char *);
+extern int sys_link (const char *, const char *);
+
+
+
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 
diff --git a/src/w32fns.c b/src/w32fns.c
index df0a16fc2a3..5ef0d9796ec 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2424,7 +2424,7 @@ w32_msg_pump (deferred_msg * msg_buf)
                  thread-safe.  The next line is okay because the cons
                  cell is never made into garbage and is not relocated by
                  GC.  */
-              XSETCAR ((Lisp_Object) ((EMACS_INT) msg.lParam), Qnil);
+              XSETCAR (XIL ((EMACS_INT) msg.lParam), Qnil);
               if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, 0, 0))
                 emacs_abort ();
               break;
@@ -2432,7 +2432,7 @@ w32_msg_pump (deferred_msg * msg_buf)
               {
                 int vk_code = (int) msg.wParam;
                 int cur_state = (GetKeyState (vk_code) & 1);
-                Lisp_Object new_state = (Lisp_Object) ((EMACS_INT) msg.lParam);
+                Lisp_Object new_state = XIL ((EMACS_INT) msg.lParam);
 
                 /* NB: This code must be thread-safe.  It is safe to
                    call NILP because symbols are not relocated by GC,
diff --git a/src/w32proc.c b/src/w32proc.c
index d8d32e78d5c..3a4b7981dcb 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -24,6 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <ctype.h>
 #include <io.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -68,8 +69,6 @@ extern BOOL WINAPI IsValidLocale (LCID, DWORD);
 
 Lisp_Object Qhigh, Qlow;
 
-typedef void (_CALLBACK_ *signal_handler) (int);
-
 /* Signal handlers...SIG_DFL == 0 so this is initialized correctly.  */
 static signal_handler sig_handlers[NSIG];
 
diff --git a/src/w32term.h b/src/w32term.h
index 91723c3758a..94ef9624351 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -682,6 +682,7 @@ extern BOOL parse_button (int, int, int *, int *);
 
 extern void w32_sys_ring_bell (struct frame *f);
 extern void x_delete_display (struct w32_display_info *dpyinfo);
+
 extern int notification_buffer_in_use;
 extern BYTE file_notifications[16384];
 extern DWORD notifications_size;
@@ -689,6 +690,9 @@ extern void *notifications_desc;
 extern Lisp_Object w32_get_watch_object (Lisp_Object);
 extern Lisp_Object lispy_file_action (DWORD);
 
+extern void w32_initialize_display_info (Lisp_Object);
+extern void initialize_w32_display (struct terminal *);
+
 /* Keypad command key support.  W32 doesn't have virtual keys defined
    for the function keys on the keypad (they are mapped to the standard
    function keys), so we define our own.  */
diff --git a/src/window.c b/src/window.c
index 61d2a8b073f..b4fee61cac8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1464,9 +1464,7 @@ if it isn't already recorded.  */)
 #endif
 
   if (! NILP (update)
-      && ! (! NILP (w->window_end_valid)
-            && w->last_modified >= BUF_MODIFF (b)
-            && w->last_overlay_modified >= BUF_OVERLAY_MODIFF (b))
+      && (windows_or_buffers_changed || NILP (w->window_end_valid))
       && !noninteractive)
     {
       struct text_pos startp;
@@ -3795,6 +3793,8 @@ resize_frame_windows (struct frame *f, int size, int horflag)
             (m, make_number (XINT (r->top_line) + XINT (r->total_lines)));
         }
     }
+
+  windows_or_buffers_changed++;
 }
 
 
@@ -4208,6 +4208,7 @@ grow_mini_window (struct window *w, int delta)
       w->last_modified = 0;
       w->last_overlay_modified = 0;
 
+      windows_or_buffers_changed++;
       adjust_glyphs (f);
       unblock_input ();
     }
@@ -4245,6 +4246,7 @@ shrink_mini_window (struct window *w)
           w->last_modified = 0;
           w->last_overlay_modified = 0;
 
+          windows_or_buffers_changed++;
           adjust_glyphs (f);
           unblock_input ();
         }
diff --git a/src/xdisp.c b/src/xdisp.c
index 1e61a74068b..6964719f958 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6302,6 +6302,8 @@ reseat_1 (struct it *it, struct text_pos pos, int set_stop_p)
       it->stop_charpos = CHARPOS (pos);
       it->base_level_stop = CHARPOS (pos);
     }
+  /* This make the information stored in it->cmp_it invalidate.  */
+  it->cmp_it.id = -1;
 }
 
 
diff --git a/src/xrdb.c b/src/xrdb.c
index 73672c9617c..9d056a607e4 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include <errno.h>
 #include <epaths.h>
-
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "lisp.h"
@@ -48,11 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #endif
 
-extern char *getenv (const char *);
-
-extern struct passwd *getpwuid (uid_t);
-extern struct passwd *getpwnam (const char *);
-
 char *x_get_string_resource (XrmDatabase rdb, const char *name,
                              const char *class);
 static int file_p (const char *filename);
@@ -429,8 +424,9 @@ get_environ_db (void)
     {
       static char const xdefaults[] = ".Xdefaults-";
       char *home = gethomedir ();
-      char const *host = get_system_name ();
-      ptrdiff_t pathsize = strlen (home) + sizeof xdefaults + strlen (host);
+      char const *host = SSDATA (Vsystem_name);
+      ptrdiff_t pathsize = (strlen (home) + sizeof xdefaults
+                            + SBYTES (Vsystem_name));
       path = xrealloc (home, pathsize);
       strcat (strcat (path, xdefaults), host);
       p = path;