Merge branch 'master' into xwidget

24 files changed, 482 insertions, 195 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e5166e22be..9e564ea6414 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,143 @@
+2015-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * coding.c (raw_text_coding_system_p): New function.
+
+        * keyboard.c (read_decoded_event_from_main_queue): Use it when the
+        keyboard coding-system is 'raw-text'.  (Bug#19532)
+
+        * coding.h (raw_text_coding_system_p): Add prototype.
+
+2015-01-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (gl-stamp): Generate globals.h through the use of
+        move-if-change.
+        (globals.h): Replace with empty command.
+
+2015-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (kbd_buffer_store_event_hold): Ignore FOCUS_OUT_EVENT
+        and ICONIFY_EVENT for the purposes of breaking while-no-input
+        loops.  (Bug#19547)
+
+        * dired.c (read_dirent): Correct the "MSDOS hacks" hack: the
+        special code for errno = ENOENT or EACCES is needed for WINDOWSNT,
+        not for MSDOS.
+
+2015-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify read_dirent's MSDOS hacks
+        * dired.c (read_dirent): Simplify by removing the need for the
+        DIR_ENTRY argument.  All callers changed.  This separates the
+        MS-DOS idiosyncrasies better from the rest of the code.
+
+2015-01-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (read_dirent): Accept an additional argument
+        FIRST_ENTRY.  If readdir fails with ENOENT or EACCES the first
+        time it is called, report the error as if it happened in
+        open_directory.
+        (directory_files_internal, file_name_completion): Adjust callers
+        or read_dirent.
+
+2015-01-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Refactor calls to opendir for simplicity
+        * dired.c (open_directory): Accept Lisp_Object, not char *, for
+        dirname.  Signal an error if the open fails.  All callers changed.
+
+2015-01-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Report readdir failures
+        Previously, on non-MS-Windows platforms the code treated most
+        readdir failures as EOF.  This was incorrect, e.g., when readdir
+        fails with errno == EOVERFLOW.  Signal an error instead.
+        * dired.c (read_dirent):
+        New function, which signals an error when readdir fails.
+        (directory_files_internal, file_name_completion): Use it.
+
+2015-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+        Use bool for boolean in w32menu.c, w32font.c, w32uniscribe.c.
+        * w32uniscribe.c (uniscribe_list, uniscribe_match): Use bool where
+        appropriate.
+
+        * w32font.c (struct font_callback_data, w32font_list_internal)
+        (w32font_driver, w32font_match_internal): Use bool where appropriate.
+
+        * w32menu.c (x_activate_menubar, set_frame_menubar)
+        (w32_dialog_show, initialize_frame_menubar, w32_menu_show)
+        (is_simple_dialog): Use bool where appropriate.
+
+2015-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use bool, not int, to track face changes
+        * xfaces.c (face_change): Rename from face_change_count, and
+        change from int to bool.  The var is now true (instead of nonzero)
+        if attributes have changed; this is simpler.  All uses changed.
+        (Bug#19698)
+
+2015-01-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (directory_files_internal, file_name_completion)
+        [WINDOWSNT]: Signal an error when errno is set non-zero by
+        'readdir', regardless of its value.
+
+        * w32.c (sys_readdir): Set errno to ENOENT when the directory
+        doesn't exist and to EACCES when it's not accessible to the
+        current user.  Set errno to zero when FindNextFile exhausts the
+        directory, so that callers don't interpret that as an error and
+        don't signal a file-error.
+        (open_unc_volume): Set errno to ENOENT if WNetOpenEnum fails.
+
+        * dired.c (directory_files_internal) [WINDOWSNT]: If readdir
+        returns NULL and errno is ENOTDIR, behave as if opendir failed to
+        open the directory.  (Bug#19701)
+
+        * w32.c (sys_readdir): If FindFirstFile fails because the
+        directory doesn't exist, set errno to ENOTDIR.
+
+2015-01-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (drawRect:): Add block/unblock_input (Bug#19660).
+
+2015-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix coding.c subscript error
+        * coding.c (CODING_ISO_INVOKED_CHARSET):
+        Avoid undefined behavior if CODING_ISO_INVOCATION returns negative.
+
+2015-01-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (produce_image_glyph): Fix display of images in R2L
+        screen lines: prepend the new glyph to the ones already there
+        instead of appending it.
+
+        * w32fns.c (w32_set_title_bar_text): New function, including
+        support for titles with non-ASCII characters outside of the
+        current system codepage.
+        (x_set_name, x_set_title): Use it.  (Bug#19590)
+
+        * indent.c (Fvertical_motion): Return zero if we started from ZV
+        and there's an overlay after-string there.  (Bug#19553)
+
+        * emacs.c (usage_message): Fix the description of the -nl switch.
+        (Bug#19542)
+
+        * xdisp.c (move_it_to, try_cursor_movement): Don't use the window
+        end information if the window_end_valid flag is unset.
+        (try_window_id): If the call to display_line invalidated the
+        window end information, give up the try_window_id optimization.
+        (Bug#19511)
+
+        * w32fns.c (Fx_server_version, Fx_server_vendor): Doc fix.
+        * xfns.c (Fx_server_version, Fx_server_vendor): Doc fix.
+
+        * emacs.c (syms_of_emacs) <system-configuration>: Doc fix.  (Bug#19502)
+
+2015-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.mk (lisp): Add cl-preloaded.
+
 2015-01-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for boolean in xfaces.c
diff --git a/src/Makefile.in b/src/Makefile.in
index 079e0e41c9f..81977dbfec2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -504,11 +504,17 @@ buildobj.h: Makefile
 
 GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
 
+AM_V_GLOBALS = $(am__v_GLOBALS_@AM_V@)
+am__v_GLOBALS_ = $(am__v_GLOBALS_@AM_DEFAULT_V@)
+am__v_GLOBALS_0 = @echo "  GEN     " globals.h;
+am__v_GLOBALS_1 =
+
 gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
-        $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@
+        $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > globals.tmp
+        $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h
+        $(AM_V_at)echo timestamp > $@
 
-globals.h: gl-stamp
-        $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@
+globals.h: gl-stamp; @true
 
 $(ALLOBJS): globals.h
 
diff --git a/src/coding.c b/src/coding.c
index 54811588c6a..1a0e1279648 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -350,7 +350,8 @@ static Lisp_Object Vbig5_coding_system;
 #define CODING_ISO_BOL(coding)  \
   ((coding)->spec.iso_2022.bol)
 #define CODING_ISO_INVOKED_CHARSET(coding, plane)       \
-  CODING_ISO_DESIGNATION ((coding), CODING_ISO_INVOCATION ((coding), (plane)))
+  (CODING_ISO_INVOCATION (coding, plane) < 0 ? -1       \
+   : CODING_ISO_DESIGNATION (coding, CODING_ISO_INVOCATION (coding, plane)))
 #define CODING_ISO_CMP_STATUS(coding)   \
   (&(coding)->spec.iso_2022.cmp_status)
 #define CODING_ISO_EXTSEGMENT_LEN(coding)       \
@@ -5978,6 +5979,15 @@ raw_text_coding_system (Lisp_Object coding_system)
           : AREF (raw_text_eol_type, 2));
 }
 
+/* Return true if CODING corresponds to raw-text coding-system.  */
+
+bool
+raw_text_coding_system_p (struct coding_system *coding)
+{
+  return (coding->decoder == decode_coding_raw_text
+          && coding->encoder == encode_coding_raw_text) ? true : false;
+}
+
 
 /* If CODING_SYSTEM doesn't specify end-of-line format, return one of
    the subsidiary that has the same eol-spec as PARENT (if it is not
diff --git a/src/coding.h b/src/coding.h
index d49d786e6dd..c73a9cc3263 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -705,6 +705,7 @@ extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object,
 extern Lisp_Object encode_file_name (Lisp_Object);
 extern Lisp_Object decode_file_name (Lisp_Object);
 extern Lisp_Object raw_text_coding_system (Lisp_Object);
+extern bool raw_text_coding_system_p (struct coding_system *);
 extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object);
 extern Lisp_Object complement_process_encoding_system (Lisp_Object);
 
diff --git a/src/dired.c b/src/dired.c
index e31fdf87ac2..5038e04cd01 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -66,8 +66,9 @@ dirent_namelen (struct dirent *dp)
 }
 
 static DIR *
-open_directory (char const *name, int *fdp)
+open_directory (Lisp_Object dirname, int *fdp)
 {
+  char *name = SSDATA (dirname);
   DIR *d;
   int fd, opendir_errno;
 
@@ -98,8 +99,9 @@ open_directory (char const *name, int *fdp)
 
   unblock_input ();
 
+  if (!d)
+    report_file_errno ("Opening directory", dirname, opendir_errno);
   *fdp = fd;
-  errno = opendir_errno;
   return d;
 }
 
@@ -120,6 +122,35 @@ directory_files_internal_unwind (void *dh)
   unblock_input ();
 }
 
+/* Return the next directory entry from DIR; DIR's name is DIRNAME.
+   If there are no more directory entries, return a null pointer.
+   Signal any unrecoverable errors.  */
+
+static struct dirent *
+read_dirent (DIR *dir, Lisp_Object dirname)
+{
+  while (true)
+    {
+      errno = 0;
+      struct dirent *dp = readdir (dir);
+      if (dp || errno == 0)
+        return dp;
+      if (! (errno == EAGAIN || errno == EINTR))
+        {
+#ifdef WINDOWSNT
+          /* The MS-Windows implementation of 'opendir' doesn't
+             actually open a directory until the first call to
+             'readdir'.  If 'readdir' fails to open the directory, it
+             sets errno to ENOENT or EACCES, see w32.c.  */
+          if (errno == ENOENT || errno == EACCES)
+            report_file_error ("Opening directory", dirname);
+#endif
+          report_file_error ("Reading directory", dirname);
+        }
+      QUIT;
+    }
+}
+
 /* Function shared by Fdirectory_files and Fdirectory_files_and_attributes.
    If not ATTRS, return a list of directory filenames;
    if ATTRS, return a list of directory filenames and their attributes.
@@ -130,15 +161,12 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
                           Lisp_Object match, Lisp_Object nosort, bool attrs,
                           Lisp_Object id_format)
 {
-  DIR *d;
-  int fd;
   ptrdiff_t directory_nbytes;
   Lisp_Object list, dirfilename, encoded_directory;
   struct re_pattern_buffer *bufp = NULL;
   bool needsep = 0;
   ptrdiff_t count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-  struct dirent *dp;
 #ifdef WINDOWSNT
   Lisp_Object w32_save = Qnil;
 #endif
@@ -182,9 +210,8 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
   /* Now *bufp is the compiled form of MATCH; don't call anything
      which might compile a new regexp until we're done with the loop!  */
 
-  d = open_directory (SSDATA (dirfilename), &fd);
-  if (d == NULL)
-    report_file_error ("Opening directory", directory);
+  int fd;
+  DIR *d = open_directory (dirfilename, &fd);
 
   /* Unfortunately, we can now invoke expand-file-name and
      file-attributes on filenames, both of which can throw, so we must
@@ -221,28 +248,13 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
       || !IS_ANY_SEP (SREF (directory, directory_nbytes - 1)))
     needsep = 1;
 
-  /* Loop reading blocks until EOF or error.  */
-  for (;;)
+  /* Loop reading directory entries.  */
+  for (struct dirent *dp; (dp = read_dirent (d, directory)); )
     {
-      ptrdiff_t len;
-      bool wanted = 0;
-      Lisp_Object name, finalname;
+      ptrdiff_t len = dirent_namelen (dp);
+      Lisp_Object name = make_unibyte_string (dp->d_name, len);
+      Lisp_Object finalname = name;
       struct gcpro gcpro1, gcpro2;
-
-      errno = 0;
-      dp = readdir (d);
-      if (!dp)
-        {
-          if (errno == EAGAIN || errno == EINTR)
-            {
-              QUIT;
-              continue;
-            }
-          break;
-        }
-
-      len = dirent_namelen (dp);
-      name = finalname = make_unibyte_string (dp->d_name, len);
       GCPRO2 (finalname, name);
 
       /* Note: DECODE_FILE can GC; it should protect its argument,
@@ -255,9 +267,8 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
       immediate_quit = 1;
       QUIT;
 
-      if (NILP (match)
-          || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0)
-        wanted = 1;
+      bool wanted = (NILP (match)
+                     || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0);
 
       immediate_quit = 0;
 
@@ -446,8 +457,6 @@ static Lisp_Object
 file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
                       Lisp_Object predicate)
 {
-  DIR *d;
-  int fd;
   ptrdiff_t bestmatchsize = 0;
   int matchcount = 0;
   /* If ALL_FLAG is 1, BESTMATCH is the list of all matches, decoded.
@@ -481,37 +490,17 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
      work with decoded file names, but we still do some filtering based
      on the encoded file name.  */
   encoded_file = ENCODE_FILE (file);
-
   encoded_dir = ENCODE_FILE (Fdirectory_file_name (dirname));
-
-  d = open_directory (SSDATA (encoded_dir), &fd);
-  if (!d)
-    report_file_error ("Opening directory", dirname);
-
+  int fd;
+  DIR *d = open_directory (encoded_dir, &fd);
   record_unwind_protect_ptr (directory_files_internal_unwind, d);
 
-  /* Loop reading blocks */
-  /* (att3b compiler bug requires do a null comparison this way) */
-  while (1)
+  /* Loop reading directory entries.  */
+  for (struct dirent *dp; (dp = read_dirent (d, dirname)); )
     {
-      struct dirent *dp;
-      ptrdiff_t len;
+      ptrdiff_t len = dirent_namelen (dp);
       bool canexclude = 0;
 
-      errno = 0;
-      dp = readdir (d);
-      if (!dp)
-        {
-          if (errno == EAGAIN || errno == EINTR)
-            {
-              QUIT;
-              continue;
-            }
-          break;
-        }
-
-      len = dirent_namelen (dp);
-
       QUIT;
       if (len < SCHARS (encoded_file)
           || (scmp (dp->d_name, SSDATA (encoded_file),
diff --git a/src/dispextern.h b/src/dispextern.h
index 9ea64fb9f63..fbf0c74454d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1860,10 +1860,10 @@ GLYPH_CODE_P (Lisp_Object gc)
                : TYPE_MAXIMUM (EMACS_INT)))));
 }
 
-/* Non-zero means face attributes have been changed since the last
+/* True means face attributes have been changed since the last
    redisplay.  Used in redisplay_internal.  */
 
-extern int face_change_count;
+extern bool face_change;
 
 /* For reordering of bidirectional text.  */
 
diff --git a/src/emacs.c b/src/emacs.c
index 03dea46fe2d..87b1f11d59b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -234,7 +234,7 @@ Initialization options:\n\
     "\
 --no-desktop                do not load a saved desktop\n\
 --no-init-file, -q          load neither ~/.emacs nor default.el\n\
---no-shared-memory, -nl     do not use shared memory\n\
+--no-loadup, -nl            do not load loadup.el into bare Emacs\n\
 --no-site-file              do not load site-start.el\n\
 --no-site-lisp, -nsl        do not add site-lisp directories to load-path\n\
 --no-splash                 do not display a splash screen on startup\n\
@@ -2398,9 +2398,7 @@ hpux, irix, usg-unix-v) indicates some sort of Unix system.  */);
   /* See configure.ac (and config.nt) for the possible SYSTEM_TYPEs.  */
 
   DEFVAR_LISP ("system-configuration", Vsystem_configuration,
-               doc: /* Value is string indicating configuration Emacs was built for.
-On MS-Windows, the value reflects the OS flavor and version on which
-Emacs is running.  */);
+               doc: /* Value is string indicating configuration Emacs was built for.  */);
   Vsystem_configuration = build_string (EMACS_CONFIGURATION);
 
   DEFVAR_LISP ("system-configuration-options", Vsystem_configuration_options,
diff --git a/src/frame.c b/src/frame.c
index 2ce5a623853..e4adfe8f08f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3632,7 +3632,7 @@ x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
 
       XSETFRAME (frame, f);
       x_set_font (f, Fframe_parameter (frame, Qfont), Qnil);
-      ++face_change_count;
+      face_change = true;
       windows_or_buffers_changed = 18;
     }
 }
diff --git a/src/indent.c b/src/indent.c
index 589aeb9c005..8660400e1ce 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2137,10 +2137,15 @@ whether or not it is currently displayed in some window.  */)
               if (nlines > 1)
                 move_it_by_lines (&it, min (PTRDIFF_MAX, nlines - 1));
             }
-          else
+          else  /* it_start = ZV */
             {
               it.vpos = 0;
               move_it_by_lines (&it, min (PTRDIFF_MAX, nlines));
+              /* We could have some display or overlay string at ZV,
+                 in which case it.vpos will be nonzero now, while
+                 actually we didn't move vertically at all.  */
+              if (IT_CHARPOS (it) == CHARPOS (pt) && CHARPOS (pt) == it_start)
+                it.vpos = 0;
             }
         }
 
diff --git a/src/insdel.c b/src/insdel.c
index 3b5b520aac8..80650be25ae 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1,7 +1,6 @@
 /* Buffer insertion/deletion and gap motion for GNU Emacs.
-
-Copyright (C) 1985-1986, 1993-1995, 1997-2015 Free Software Foundation,
-Inc.
+   Copyright (C) 1985-1986, 1993-1995, 1997-2015 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index a5e1363326c..a9ff77d0473 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2288,30 +2288,41 @@ read_decoded_event_from_main_queue (struct timespec *end_time,
             { /* An encoded byte sequence, let's try to decode it.  */
               struct coding_system *coding
                 = TERMINAL_KEYBOARD_CODING (terminal);
-              unsigned char src[MAX_ENCODED_BYTES];
-              unsigned char dest[MAX_ENCODED_BYTES * MAX_MULTIBYTE_LENGTH];
-              int i;
-              for (i = 0; i < n; i++)
-                src[i] = XINT (events[i]);
-              if (meta_key != 2)
-                for (i = 0; i < n; i++)
-                  src[i] &= ~0x80;
-              coding->destination = dest;
-              coding->dst_bytes = sizeof dest;
-              decode_coding_c_string (coding, src, n, Qnil);
-              eassert (coding->produced_char <= n);
-              if (coding->produced_char == 0)
-                { /* The encoded sequence is incomplete.  */
-                  if (n < MAX_ENCODED_BYTES) /* Avoid buffer overflow.  */
-                    continue;                /* Read on!  */
+
+              if (raw_text_coding_system_p (coding))
+                {
+                  int i;
+                  if (meta_key != 2)
+                    for (i = 0; i < n; i++)
+                      events[i] = make_number (XINT (events[i]) & ~0x80);
                 }
               else
                 {
-                  const unsigned char *p = coding->destination;
-                  eassert (coding->carryover_bytes == 0);
-                  n = 0;
-                  while (n < coding->produced_char)
-                    events[n++] = make_number (STRING_CHAR_ADVANCE (p));
+                  unsigned char src[MAX_ENCODED_BYTES];
+                  unsigned char dest[MAX_ENCODED_BYTES * MAX_MULTIBYTE_LENGTH];
+                  int i;
+                  for (i = 0; i < n; i++)
+                    src[i] = XINT (events[i]);
+                  if (meta_key != 2)
+                    for (i = 0; i < n; i++)
+                      src[i] &= ~0x80;
+                  coding->destination = dest;
+                  coding->dst_bytes = sizeof dest;
+                  decode_coding_c_string (coding, src, n, Qnil);
+                  eassert (coding->produced_char <= n);
+                  if (coding->produced_char == 0)
+                    { /* The encoded sequence is incomplete.  */
+                      if (n < MAX_ENCODED_BYTES) /* Avoid buffer overflow.  */
+                        continue;                    /* Read on!  */
+                    }
+                  else
+                    {
+                      const unsigned char *p = coding->destination;
+                      eassert (coding->carryover_bytes == 0);
+                      n = 0;
+                      while (n < coding->produced_char)
+                        events[n++] = make_number (STRING_CHAR_ADVANCE (p));
+                    }
                 }
             }
           /* Now `events' should hold decoded events.
@@ -3639,7 +3650,9 @@ kbd_buffer_store_event_hold (register struct input_event *event,
      as input, set quit-flag to cause an interrupt.  */
   if (!NILP (Vthrow_on_input)
       && event->kind != FOCUS_IN_EVENT
+      && event->kind != FOCUS_OUT_EVENT
       && event->kind != HELP_EVENT
+      && event->kind != ICONIFY_EVENT
       && event->kind != DEICONIFY_EVENT)
     {
       Vquit_flag = Vthrow_on_input;
diff --git a/src/lisp.mk b/src/lisp.mk
index a9deb2b53d9..ee2a07c0fd7 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -71,6 +71,7 @@ lisp = \
         $(lispsource)/faces.elc \
         $(lispsource)/button.elc \
         $(lispsource)/startup.elc \
+        $(lispsource)/emacs-lisp/cl-preloaded.elc \
         $(lispsource)/emacs-lisp/nadvice.elc \
         $(lispsource)/minibuffer.elc \
         $(lispsource)/abbrev.elc \
diff --git a/src/msdos.c b/src/msdos.c
index 3c2277e6955..8b05b34795d 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1733,7 +1733,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
 
   if (redraw)
     {
-      face_change_count++;      /* forces xdisp.c to recompute basic faces */
+      face_change = true;       /* forces xdisp.c to recompute basic faces */
       if (f == SELECTED_FRAME ())
         redraw_frame (f);
     }
diff --git a/src/nsterm.m b/src/nsterm.m
index ee1268ef850..e90c3d70db3 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6773,7 +6773,9 @@ if (cols > 0 && rows > 0)
     return;
 
   ns_clear_frame_area (emacsframe, x, y, width, height);
+  block_input ();
   expose_frame (emacsframe, x, y, width, height);
+  unblock_input ();
 
   /*
     drawRect: may be called (at least in OS X 10.5) for invisible
diff --git a/src/w32.c b/src/w32.c
index 31b13289b57..90096689776 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3433,17 +3433,51 @@ sys_readdir (DIR *dirp)
         }
 
       if (dir_find_handle == INVALID_HANDLE_VALUE)
-        return NULL;
+        {
+          /* Any changes in the value of errno here should be in sync
+             with what directory_files_internal does when it calls
+             readdir.  */
+          switch (GetLastError ())
+            {
+              /* Windows uses this value when FindFirstFile finds no
+                 files that match the wildcard.  This is not supposed
+                 to happen, since our wildcard is "*", but just in
+                 case, if there's some weird empty directory with not
+                 even "." and ".." entries...  */
+            case ERROR_FILE_NOT_FOUND:
+              errno = 0;
+              /* FALLTHRU */
+            default:
+              break;
+            case ERROR_ACCESS_DENIED:
+            case ERROR_NETWORK_ACCESS_DENIED:
+              errno = EACCES;
+              break;
+            case ERROR_PATH_NOT_FOUND:
+            case ERROR_INVALID_DRIVE:
+            case ERROR_BAD_NETPATH:
+            case ERROR_BAD_NET_NAME:
+              errno = ENOENT;
+              break;
+            }
+          return NULL;
+        }
     }
   else if (w32_unicode_filenames)
     {
       if (!FindNextFileW (dir_find_handle, &dir_find_data_w))
-        return NULL;
+        {
+          errno = 0;
+          return NULL;
+        }
     }
   else
     {
       if (!FindNextFileA (dir_find_handle, &dir_find_data_a))
-        return NULL;
+        {
+          errno = 0;
+          return NULL;
+        }
     }
 
   /* Emacs never uses this value, so don't bother making it match
@@ -3545,7 +3579,11 @@ open_unc_volume (const char *path)
   if (result == NO_ERROR)
     return henum;
   else
-    return INVALID_HANDLE_VALUE;
+    {
+      /* Make sure directory_files_internal reports a sensible error.  */
+      errno = ENOENT;
+      return INVALID_HANDLE_VALUE;
+    }
 }
 
 static void *
diff --git a/src/w32fns.c b/src/w32fns.c
index c269c4f8e68..8435270438d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1759,6 +1759,50 @@ x_change_tool_bar_height (struct frame *f, int height)
     x_clear_under_internal_border (f);
 }
 
+static void
+w32_set_title_bar_text (struct frame *f, Lisp_Object name)
+{
+  if (FRAME_W32_WINDOW (f))
+    {
+      block_input ();
+#ifdef __CYGWIN__
+      GUI_FN (SetWindowText) (FRAME_W32_WINDOW (f),
+                              GUI_SDATA (GUI_ENCODE_SYSTEM (name)));
+#else
+      /* The frame's title many times shows the name of the file
+         visited in the selected window's buffer, so it makes sense to
+         support non-ASCII characters outside of the current system
+         codepage in the title.  */
+      if (w32_unicode_filenames)
+        {
+          Lisp_Object encoded_title = ENCODE_UTF_8 (name);
+          wchar_t *title_w;
+          int tlen = pMultiByteToWideChar (CP_UTF8, 0, SSDATA (encoded_title),
+                                           -1, NULL, 0);
+
+          if (tlen > 0)
+            {
+              /* Windows truncates the title text beyond what fits on
+                 a single line, so we can limit the length to some
+                 reasonably large value, and use alloca.  */
+              if (tlen > 10000)
+                tlen = 10000;
+              title_w = alloca ((tlen + 1) * sizeof (wchar_t));
+              pMultiByteToWideChar (CP_UTF8, 0, SSDATA (encoded_title), -1,
+                                    title_w, tlen);
+              title_w[tlen] = L'\0';
+              SetWindowTextW (FRAME_W32_WINDOW (f), title_w);
+            }
+          else  /* Conversion to UTF-16 failed, so we punt.  */
+            SetWindowTextA (FRAME_W32_WINDOW (f),
+                            SSDATA (ENCODE_SYSTEM (name)));
+        }
+      else
+        SetWindowTextA (FRAME_W32_WINDOW (f), SSDATA (ENCODE_SYSTEM (name)));
+#endif
+      unblock_input ();
+    }
+}
 
 /* Change the name of frame F to NAME.  If NAME is nil, set F's name to
        w32_id_name.
@@ -1812,13 +1856,7 @@ x_set_name (struct frame *f, Lisp_Object name, bool explicit)
   if (! NILP (f->title))
     name = f->title;
 
-  if (FRAME_W32_WINDOW (f))
-    {
-      block_input ();
-      GUI_FN (SetWindowText) (FRAME_W32_WINDOW (f),
-                              GUI_SDATA (GUI_ENCODE_SYSTEM (name)));
-      unblock_input ();
-    }
+  w32_set_title_bar_text (f, name);
 }
 
 /* This function should be called when the user's lisp code has
@@ -1856,13 +1894,7 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
   if (NILP (name))
     name = f->name;
 
-  if (FRAME_W32_WINDOW (f))
-    {
-      block_input ();
-      GUI_FN (SetWindowText) (FRAME_W32_WINDOW (f),
-                              GUI_SDATA (GUI_ENCODE_SYSTEM (name)));
-      unblock_input ();
-    }
+  w32_set_title_bar_text (f, name);
 }
 
 void
@@ -4895,25 +4927,38 @@ If omitted or nil, that stands for the selected frame's display.  */)
 }
 
 DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
-       doc: /* Return the "vendor ID" string of the W32 system (Microsoft).
-The optional argument DISPLAY specifies which display to ask about.
-DISPLAY should be either a frame or a display name (a string).
+       doc: /* Return the "vendor ID" string of the GUI software on TERMINAL.
+
+\(Labeling every distributor as a "vendor" embodies the false assumption
+that operating systems cannot be developed and distributed noncommercially.)
+
+For GNU and Unix systems, this queries the X server software; for
+MS-Windows, this queries the OS.
+
+The optional argument TERMINAL specifies which display to ask about.
+TERMINAL should be a terminal object, a frame or a display name (a string).
 If omitted or nil, that stands for the selected frame's display.  */)
-  (Lisp_Object display)
+  (Lisp_Object terminal)
 {
   return build_string ("Microsoft Corp.");
 }
 
 DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
-       doc: /* Return the version numbers of the server of DISPLAY.
-The value is a list of three integers: the major and minor
-version numbers of the X Protocol in use, and the distributor-specific
-release number.  See also the function `x-server-vendor'.
+       doc: /* Return the version numbers of the GUI software on TERMINAL.
+The value is a list of three integers specifying the version of the GUI
+software in use.
 
-The optional argument DISPLAY specifies which display to ask about.
-DISPLAY should be either a frame or a display name (a string).
+For GNU and Unix system, the first 2 numbers are the version of the X
+Protocol used on TERMINAL and the 3rd number is the distributor-specific
+release number.  For MS-Windows, the 3 numbers report the version and
+the build number of the OS.
+
+See also the function `x-server-vendor'.
+
+The optional argument TERMINAL specifies which display to ask about.
+TERMINAL should be a terminal object, a frame or a display name (a string).
 If omitted or nil, that stands for the selected frame's display.  */)
-  (Lisp_Object display)
+  (Lisp_Object terminal)
 {
   return list3i (w32_major_version, w32_minor_version, w32_build_number);
 }
@@ -5623,7 +5668,7 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
   ptrdiff_t count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3;
   struct kboard *kb;
-  int face_change_count_before = face_change_count;
+  bool face_change_before = face_change;
   Lisp_Object buffer;
   struct buffer *old_buffer;
 
@@ -5835,11 +5880,11 @@ x_create_tip_frame (struct w32_display_info *dpyinfo,
   f->can_x_set_window_size = true;
 
   /* Setting attributes of faces of the tooltip frame from resources
-     and similar will increment face_change_count, which leads to the
+     and similar will set face_change, which leads to the
      clearing of all current matrices.  Since this isn't necessary
-     here, avoid it by resetting face_change_count to the value it
+     here, avoid it by resetting face_change to the value it
      had before we created the tip frame.  */
-  face_change_count = face_change_count_before;
+  face_change = face_change_before;
 
   /* Discard the unwind_protect.  */
   return unbind_to (count, frame);
diff --git a/src/w32font.c b/src/w32font.c
index ab772679908..360ad3f1c48 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -95,7 +95,7 @@ struct font_callback_data
   /* The list to add matches to.  */
   Lisp_Object list;
   /* Whether to match only opentype fonts.  */
-  int opentype_only;
+  bool opentype_only;
 };
 
 /* Handles the problem that EnumFontFamiliesEx will not return all
@@ -746,7 +746,8 @@ w32font_otf_drive (struct font *font, Lisp_Object features,
    Additional parameter opentype_only restricts the returned fonts to
    opentype fonts, which can be used with the Uniscribe backend.  */
 Lisp_Object
-w32font_list_internal (struct frame *f, Lisp_Object font_spec, int opentype_only)
+w32font_list_internal (struct frame *f, Lisp_Object font_spec,
+                       bool opentype_only)
 {
   struct font_callback_data match_data;
   HDC dc;
@@ -798,7 +799,8 @@ w32font_list_internal (struct frame *f, Lisp_Object font_spec, int opentype_only
    Additional parameter opentype_only restricts the returned fonts to
    opentype fonts, which can be used with the Uniscribe backend.  */
 Lisp_Object
-w32font_match_internal (struct frame *f, Lisp_Object font_spec, int opentype_only)
+w32font_match_internal (struct frame *f, Lisp_Object font_spec,
+                        bool opentype_only)
 {
   struct font_callback_data match_data;
   HDC dc;
@@ -2459,7 +2461,7 @@ w32font_filter_properties (Lisp_Object font, Lisp_Object alist)
 struct font_driver w32font_driver =
   {
     LISP_INITIALLY_ZERO, /* Qgdi */
-    0, /* case insensitive */
+    false, /* case insensitive */
     w32font_get_cache,
     w32font_list,
     w32font_match,
diff --git a/src/w32font.h b/src/w32font.h
index 82c5e09b9fc..0ad01254be9 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -66,10 +66,10 @@ struct w32font_info
 Lisp_Object w32font_get_cache (struct frame *fe);
 Lisp_Object w32font_list_internal (struct frame *f,
                                    Lisp_Object font_spec,
-                                   int opentype_only);
+                                   bool opentype_only);
 Lisp_Object w32font_match_internal (struct frame *f,
                                     Lisp_Object font_spec,
-                                    int opentype_only);
+                                    bool opentype_only);
 int w32font_open_internal (struct frame *f, Lisp_Object font_entity,
                            int pixel_size, Lisp_Object font_object);
 void w32font_close (struct font *font);
diff --git a/src/w32heap.c b/src/w32heap.c
index d5a9dae0aa4..ee0eb161502 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,5 +1,5 @@
-/* Heap management routines for GNU Emacs on the Microsoft Windows
-   API.  Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc.
+/* Heap management routines for GNU Emacs on the Microsoft Windows API.
+   Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/src/w32menu.c b/src/w32menu.c
index 2a1dafbd6d7..40b8f5f82a0 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -103,7 +103,7 @@ void set_frame_menubar (struct frame *, bool, bool);
 #ifdef HAVE_DIALOGS
 static Lisp_Object w32_dialog_show (struct frame *, Lisp_Object, Lisp_Object, char **);
 #else
-static int is_simple_dialog (Lisp_Object);
+static bool is_simple_dialog (Lisp_Object);
 static Lisp_Object simple_dialog_show (struct frame *, Lisp_Object, Lisp_Object);
 #endif
 
@@ -166,7 +166,7 @@ w32_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
 void
 x_activate_menubar (struct frame *f)
 {
-  set_frame_menubar (f, 0, 1);
+  set_frame_menubar (f, false, true);
 
   /* Lock out further menubar changes while active.  */
   f->output_data.w32->menubar_active = 1;
@@ -289,7 +289,7 @@ set_frame_menubar (struct frame *f, bool first_time, bool deep_p)
   XSETFRAME (Vmenu_updating_frame, f);
 
   if (! menubar_widget)
-    deep_p = 1;
+    deep_p = true;
 
   if (deep_p)
     {
@@ -388,7 +388,7 @@ set_frame_menubar (struct frame *f, bool first_time, bool deep_p)
           else
             first_wv->contents = wv;
           /* Don't set wv->name here; GC during the loop might relocate it.  */
-          wv->enabled = 1;
+          wv->enabled = true;
           wv->button_type = BUTTON_TYPE_NONE;
           prev_wv = wv;
         }
@@ -501,7 +501,7 @@ set_frame_menubar (struct frame *f, bool first_time, bool deep_p)
     /* Force the window size to be recomputed so that the frame's text
        area remains the same, if menubar has just been created.  */
     if (old_widget == NULL)
-      adjust_frame_size (f, -1, -1, 2, 0, Qmenu_bar_lines);
+      adjust_frame_size (f, -1, -1, 2, false, Qmenu_bar_lines);
   }
 
   unblock_input ();
@@ -518,7 +518,7 @@ initialize_frame_menubar (struct frame *f)
   /* This function is called before the first chance to redisplay
      the frame.  It has to be, so the frame will have the right size.  */
   fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
-  set_frame_menubar (f, 1, 1);
+  set_frame_menubar (f, true, true);
 }
 
 /* Get rid of the menu bar of frame F, and free its storage.
@@ -570,7 +570,7 @@ w32_menu_show (struct frame *f, int x, int y, int menuflags,
   Lisp_Object *subprefix_stack
     = (Lisp_Object *) alloca (menu_items_used * word_size);
   int submenu_depth = 0;
-  int first_pane;
+  bool first_pane;
 
   *error = NULL;
 
@@ -590,7 +590,7 @@ w32_menu_show (struct frame *f, int x, int y, int menuflags,
   wv = make_widget_value ("menu", NULL, true, Qnil);
   wv->button_type = BUTTON_TYPE_NONE;
   first_wv = wv;
-  first_pane = 1;
+  first_pane = true;
 
   /* Loop over all panes and items, filling in the tree.  */
   i = 0;
@@ -601,14 +601,14 @@ w32_menu_show (struct frame *f, int x, int y, int menuflags,
           submenu_stack[submenu_depth++] = save_wv;
           save_wv = prev_wv;
           prev_wv = 0;
-          first_pane = 1;
+          first_pane = false;
           i++;
         }
       else if (EQ (AREF (menu_items, i), Qlambda))
         {
           prev_wv = save_wv;
           save_wv = submenu_stack[--submenu_depth];
-          first_pane = 0;
+          first_pane = false;
           i++;
         }
       else if (EQ (AREF (menu_items, i), Qt)
@@ -664,7 +664,7 @@ w32_menu_show (struct frame *f, int x, int y, int menuflags,
               save_wv = wv;
               prev_wv = 0;
             }
-          first_pane = 0;
+          first_pane = false;
           i += MENU_ITEMS_PANE_LENGTH;
         }
       else
@@ -883,8 +883,9 @@ w32_dialog_show (struct frame *f, Lisp_Object title,
 
   /* Number of elements seen so far, before boundary.  */
   int left_count = 0;
-  /* 1 means we've seen the boundary between left-hand elts and right-hand.  */
-  int boundary_seen = 0;
+  /* true means we've seen the boundary between left-hand elts and
+     right-hand.  */
+  bool boundary_seen = false;
 
   *error = NULL;
 
@@ -928,7 +929,7 @@ w32_dialog_show (struct frame *f, Lisp_Object title,
           {
             /* This is the boundary between left-side elts
                and right-side elts.  Stop incrementing right_count.  */
-            boundary_seen = 1;
+            boundary_seen = true;
             i++;
             continue;
           }
@@ -986,7 +987,7 @@ w32_dialog_show (struct frame *f, Lisp_Object title,
   /* Actually create the dialog.  */
   dialog_id = widget_id_tick++;
   menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,
-                           f->output_data.w32->widget, 1, 0,
+                           f->output_data.w32->widget, true, 0,
                            dialog_selection_callback, 0);
   lw_modify_all_widgets (dialog_id, first_wv->contents, TRUE);
 
@@ -1037,25 +1038,25 @@ w32_dialog_show (struct frame *f, Lisp_Object title,
    anywhere in Emacs that uses the other specific dialog choices that
    MessageBox provides.  */
 
-static int
+static bool
 is_simple_dialog (Lisp_Object contents)
 {
   Lisp_Object options;
   Lisp_Object name, yes, no, other;
 
   if (!CONSP (contents))
-    return 0;
+    return false;
   options = XCDR (contents);
 
   yes = build_string ("Yes");
   no = build_string ("No");
 
   if (!CONSP (options))
-    return 0;
+    return false;
 
   name = XCAR (options);
   if (!CONSP (name))
-    return 0;
+    return false;
   name = XCAR (name);
 
   if (!NILP (Fstring_equal (name, yes)))
@@ -1063,18 +1064,18 @@ is_simple_dialog (Lisp_Object contents)
   else if (!NILP (Fstring_equal (name, no)))
     other = yes;
   else
-    return 0;
+    return false;
 
   options = XCDR (options);
   if (!CONSP (options))
-    return 0;
+    return false;
 
   name = XCAR (options);
   if (!CONSP (name))
-    return 0;
+    return false;
   name = XCAR (name);
   if (NILP (Fstring_equal (name, other)))
-    return 0;
+    return false;
 
   /* Check there are no more options.  */
   options = XCDR (options);
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 9cd97e28616..73c0410c7b7 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -67,7 +67,7 @@ memq_no_quit (Lisp_Object elt, Lisp_Object list)
 static Lisp_Object
 uniscribe_list (struct frame *f, Lisp_Object font_spec)
 {
-  Lisp_Object fonts = w32font_list_internal (f, font_spec, 1);
+  Lisp_Object fonts = w32font_list_internal (f, font_spec, true);
   FONT_ADD_LOG ("uniscribe-list", font_spec, fonts);
   return fonts;
 }
@@ -75,7 +75,7 @@ uniscribe_list (struct frame *f, Lisp_Object font_spec)
 static Lisp_Object
 uniscribe_match (struct frame *f, Lisp_Object font_spec)
 {
-  Lisp_Object entity = w32font_match_internal (f, font_spec, 1);
+  Lisp_Object entity = w32font_match_internal (f, font_spec, true);
   FONT_ADD_LOG ("uniscribe-match", font_spec, entity);
   return entity;
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index d868633e25c..01d598fe2c2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2730,9 +2730,9 @@ init_iterator (struct it *it, struct window *w,
      free realized faces now because they depend on face definitions
      that might have changed.  Don't free faces while there might be
      desired matrices pending which reference these faces.  */
-  if (face_change_count && !inhibit_free_realized_faces)
+  if (face_change && !inhibit_free_realized_faces)
     {
-      face_change_count = 0;
+      face_change = false;
       free_all_realized_faces (Qnil);
     }
 
@@ -9316,6 +9316,7 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos
       && it->current_x == it->last_visible_x - 1
       && it->c != '\n'
       && it->c != '\t'
+      && it->w->window_end_valid
       && it->vpos < it->w->window_end_vpos)
     {
       it->continuation_lines_width += it->current_x;
@@ -13425,10 +13426,10 @@ redisplay_internal (void)
   last_glyphless_glyph_frame = NULL;
   last_glyphless_glyph_face_id = (1 << FACE_ID_BITS);
 
-  /* If face_change_count is non-zero, init_iterator will free all
-     realized faces, which includes the faces referenced from current
-     matrices.  So, we can't reuse current matrices in this case.  */
-  if (face_change_count)
+  /* If face_change, init_iterator will free all realized faces, which
+     includes the faces referenced from current matrices.  So, we
+     can't reuse current matrices in this case.  */
+  if (face_change)
     windows_or_buffers_changed = 47;
 
   if ((FRAME_TERMCAP_P (sf) || FRAME_MSDOS_P (sf))
@@ -15436,7 +15437,8 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
   /* Likewise there was a check whether window_end_vpos is nil or larger
      than the window.  Now window_end_vpos is int and so never nil, but
      let's leave eassert to check whether it fits in the window.  */
-  eassert (w->window_end_vpos < w->current_matrix->nrows);
+  eassert (!w->window_end_valid
+           || w->window_end_vpos < w->current_matrix->nrows);
 
   /* Handle case where text has not changed, only point, and it has
      not moved off the frame.  */
@@ -18183,6 +18185,21 @@ try_window_id (struct window *w)
   if (f->fonts_changed)
     return -1;
 
+  /* The redisplay iterations in display_line above could have
+     triggered font-lock, which could have done something that
+     invalidates IT->w window's end-point information, on which we
+     rely below.  E.g., one package, which will remain unnamed, used
+     to install a font-lock-fontify-region-function that called
+     bury-buffer, whose side effect is to switch the buffer displayed
+     by IT->w, and that predictably resets IT->w's window_end_valid
+     flag, which we already tested at the entry to this function.
+     Amply punish such packages/modes by giving up on this
+     optimization in those cases.  */
+  if (!w->window_end_valid)
+    {
+      clear_glyph_matrix (w->desired_matrix);
+      return -1;
+    }
 
   /* Compute differences in buffer positions, y-positions etc.  for
      lines reused at the bottom of the window.  Compute what we can
@@ -25728,6 +25745,15 @@ produce_image_glyph (struct it *it)
       enum glyph_row_area area = it->area;
 
       glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area];
+      if (it->glyph_row->reversed_p)
+        {
+          struct glyph *g;
+
+          /* Make room for the new glyph.  */
+          for (g = glyph - 1; g >= it->glyph_row->glyphs[it->area]; g--)
+            g[1] = *g;
+          glyph = it->glyph_row->glyphs[it->area];
+        }
       if (glyph < it->glyph_row->glyphs[area + 1])
         {
           glyph->charpos = CHARPOS (it->position);
diff --git a/src/xfaces.c b/src/xfaces.c
index 7c9f62683fd..6e01ab08cef 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -313,10 +313,10 @@ static int clear_font_table_count;
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
-/* Non-zero means face attributes have been changed since the last
+/* True means face attributes have been changed since the last
    redisplay.  Used in redisplay_internal.  */
 
-int face_change_count;
+bool face_change;
 
 /* True means don't display bold text if a face's foreground
    and background colors are the inverse of the default colors of the
@@ -694,7 +694,7 @@ Optional THOROUGHLY non-nil means try to free unused fonts, too.  */)
   (Lisp_Object thoroughly)
 {
   clear_face_cache (!NILP (thoroughly));
-  ++face_change_count;
+  face_change = true;
   windows_or_buffers_changed = 53;
   return Qnil;
 }
@@ -2530,11 +2530,11 @@ Value is a vector of face attributes.  */)
   /* Changing a named face means that all realized faces depending on
      that face are invalid.  Since we cannot tell which realized faces
      depend on the face, make sure they are all removed.  This is done
-     by incrementing face_change_count.  The next call to
-     init_iterator will then free realized faces.  */
+     by setting face_change.  The next call to init_iterator will then
+     free realized faces.  */
   if (NILP (Fget (face, Qface_no_inherit)))
     {
-      ++face_change_count;
+      face_change = true;
       windows_or_buffers_changed = 54;
     }
 
@@ -2609,11 +2609,11 @@ The value is TO.  */)
   /* Changing a named face means that all realized faces depending on
      that face are invalid.  Since we cannot tell which realized faces
      depend on the face, make sure they are all removed.  This is done
-     by incrementing face_change_count.  The next call to
-     init_iterator will then free realized faces.  */
+     by setting face_change.  The next call to init_iterator will then
+     free realized faces.  */
   if (NILP (Fget (to, Qface_no_inherit)))
     {
-      ++face_change_count;
+      face_change = true;
       windows_or_buffers_changed = 55;
     }
 
@@ -3107,13 +3107,13 @@ FRAME 0 means change the face on all frames, and change the default
   /* Changing a named face means that all realized faces depending on
      that face are invalid.  Since we cannot tell which realized faces
      depend on the face, make sure they are all removed.  This is done
-     by incrementing face_change_count.  The next call to
-     init_iterator will then free realized faces.  */
+     by setting face_change.  The next call to init_iterator will then
+     free realized faces.  */
   if (!EQ (frame, Qt)
       && NILP (Fget (face, Qface_no_inherit))
       && NILP (Fequal (old_value, value)))
     {
-      ++face_change_count;
+      face_change = true;
       windows_or_buffers_changed = 56;
     }
 
@@ -3281,12 +3281,12 @@ update_face_from_frame_parameter (struct frame *f, Lisp_Object param,
   /* Changing a named face means that all realized faces depending on
      that face are invalid.  Since we cannot tell which realized faces
      depend on the face, make sure they are all removed.  This is done
-     by incrementing face_change_count.  The next call to
-     init_iterator will then free realized faces.  */
+     by setting face_change.  The next call to init_iterator will then
+     free realized faces.  */
   if (!NILP (face)
       && NILP (Fget (face, Qface_no_inherit)))
     {
-      ++face_change_count;
+      face_change = true;
       windows_or_buffers_changed = 57;
     }
 }
@@ -5820,7 +5820,7 @@ is non-nil.  */)
   (Lisp_Object suppress)
 {
   tty_suppress_bold_inverse_default_colors_p = !NILP (suppress);
-  ++face_change_count;
+  face_change = true;
   return suppress;
 }
 
diff --git a/src/xfns.c b/src/xfns.c
index 9dd00868d7b..65eb6b497f2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3542,10 +3542,15 @@ If omitted or nil, that stands for the selected frame's display.  */)
 }
 
 DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
-       doc: /* Return the "vendor ID" string of the X server of display TERMINAL.
+       doc: /* Return the "vendor ID" string of the GUI software on TERMINAL.
+
 \(Labeling every distributor as a "vendor" embodies the false assumption
 that operating systems cannot be developed and distributed noncommercially.)
 The optional argument TERMINAL specifies which display to ask about.
+
+For GNU and Unix systems, this queries the X server software; for
+MS-Windows, this queries the OS.
+
 TERMINAL should be a terminal object, a frame or a display name (a string).
 If omitted or nil, that stands for the selected frame's display.  */)
   (Lisp_Object terminal)
@@ -3558,10 +3563,16 @@ If omitted or nil, that stands for the selected frame's display.  */)
 }
 
 DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
-       doc: /* Return the version numbers of the X server of display TERMINAL.
-The value is a list of three integers: the major and minor
-version numbers of the X Protocol in use, and the distributor-specific release
-number.  See also the function `x-server-vendor'.
+       doc: /* Return the version numbers of the GUI software on TERMINAL.
+The value is a list of three integers specifying the version of the GUI
+software in use.
+
+For GNU and Unix system, the first 2 numbers are the version of the X
+Protocol used on TERMINAL and the 3rd number is the distributor-specific
+release number.  For MS-Windows, the 3 numbers report the version and
+the build number of the OS.
+
+See also the function `x-server-vendor'.
 
 The optional argument TERMINAL specifies which display to ask about.
 TERMINAL should be a terminal object, a frame or a display name (a string).
@@ -4921,7 +4932,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
   int width, height;
   ptrdiff_t count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3;
-  int face_change_count_before = face_change_count;
+  bool face_change_before = face_change;
   Lisp_Object buffer;
   struct buffer *old_buffer;
 
@@ -5218,11 +5229,11 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
   f->can_x_set_window_size = true;
 
   /* Setting attributes of faces of the tooltip frame from resources
-     and similar will increment face_change_count, which leads to the
-     clearing of all current matrices.  Since this isn't necessary
-     here, avoid it by resetting face_change_count to the value it
-     had before we created the tip frame.  */
-  face_change_count = face_change_count_before;
+     and similar will set face_change, which leads to the clearing of
+     all current matrices.  Since this isn't necessary here, avoid it
+     by resetting face_change to the value it had before we created
+     the tip frame.  */
+  face_change = face_change_before;
 
   /* Discard the unwind_protect.  */
   return unbind_to (count, frame);