Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

26 files changed, 708 insertions, 2156 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 9ac3ad84131..91b4c6e1515 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3765,7 +3765,7 @@ queue_doomed_finalizers (struct Lisp_Finalizer *dest,
 static Lisp_Object
 run_finalizer_handler (Lisp_Object args)
 {
-  add_to_log ("finalizer failed: %S", args, Qnil);
+  add_to_log ("finalizer failed: %S", args);
   return Qnil;
 }
 
@@ -5339,6 +5339,10 @@ purecopy (Lisp_Object obj)
   if (PURE_POINTER_P (XPNTR (obj)) || INTEGERP (obj) || SUBRP (obj))
     return obj;    /* Already pure.  */
 
+  if (STRINGP (obj) && XSTRING (obj)->intervals)
+    message_with_string ("Dropping text-properties while making string `%s' pure",
+                         obj, true);
+
   if (HASH_TABLE_P (Vpurify_flag)) /* Hash consing.  */
     {
       Lisp_Object tmp = Fgethash (obj, Vpurify_flag, Qnil);
@@ -5351,13 +5355,9 @@ purecopy (Lisp_Object obj)
   else if (FLOATP (obj))
     obj = make_pure_float (XFLOAT_DATA (obj));
   else if (STRINGP (obj))
-    {
-      if (XSTRING (obj)->intervals)
-        message ("Dropping text-properties when making string pure");
-      obj = make_pure_string (SSDATA (obj), SCHARS (obj),
-                              SBYTES (obj),
-                              STRING_MULTIBYTE (obj));
-    }
+    obj = make_pure_string (SSDATA (obj), SCHARS (obj),
+                            SBYTES (obj),
+                            STRING_MULTIBYTE (obj));
   else if (COMPILEDP (obj) || VECTORP (obj) || HASH_TABLE_P (obj))
     {
       struct Lisp_Vector *objp = XVECTOR (obj);
diff --git a/src/bidi.c b/src/bidi.c
index e06430c8b84..bcc15b8c8f5 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1313,13 +1313,13 @@ bidi_fetch_char (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t *disp_pos,
           /* `(space ...)' display specs are handled as paragraph
              separators for the purposes of the reordering; see UAX#9
              section 3 and clause HL1 in section 4.3 there.  */
-          ch = 0x2029;
+          ch = PARAGRAPH_SEPARATOR;
         }
       else
         {
           /* All other display specs are handled as the Unicode Object
              Replacement Character.  */
-          ch = 0xFFFC;
+          ch = OBJECT_REPLACEMENT_CHARACTER;
         }
       disp_end_pos = compute_display_string_end (*disp_pos, string);
       if (disp_end_pos < 0)
@@ -2482,8 +2482,8 @@ typedef struct bpa_stack_entry {
 
 #define CANONICAL_EQU(c)                                        \
   ( ASCII_CHAR_P (c) ? c                                        \
-    : (c) == 0x2329 ? 0x3008                                    \
-    : (c) == 0x232a ? 0x3009                                    \
+    : (c) == LEFT_POINTING_ANGLE_BRACKET ? LEFT_ANGLE_BRACKET   \
+    : (c) == RIGHT_POINTING_ANGLE_BRACKET ? RIGHT_ANGLE_BRACKET \
     : c )
 
 #ifdef ENABLE_CHECKING
diff --git a/src/character.h b/src/character.h
index 859d717a0ba..67d4bca4a23 100644
--- a/src/character.h
+++ b/src/character.h
@@ -59,6 +59,30 @@ INLINE_HEADER_BEGIN
 /* Maximum leading code of multibyte characters.  */
 #define MAX_MULTIBYTE_LEADING_CODE 0xF8
 
+/* Unicode character values.  */
+enum
+{
+  NO_BREAK_SPACE = 0x00A0,
+  SOFT_HYPHEN = 0x00AD,
+  ZERO_WIDTH_NON_JOINER = 0x200C,
+  ZERO_WIDTH_JOINER = 0x200D,
+  HYPHEN = 0x2010,
+  NON_BREAKING_HYPHEN = 0x2011,
+  LEFT_SINGLE_QUOTATION_MARK = 0x2018,
+  RIGHT_SINGLE_QUOTATION_MARK = 0x2019,
+  PARAGRAPH_SEPARATOR = 0x2029,
+  LEFT_POINTING_ANGLE_BRACKET = 0x2329,
+  RIGHT_POINTING_ANGLE_BRACKET = 0x232A,
+  LEFT_ANGLE_BRACKET = 0x3008,
+  RIGHT_ANGLE_BRACKET = 0x3009,
+  OBJECT_REPLACEMENT_CHARACTER = 0xFFFC,
+};
+
+/* UTF-8 encodings.  Use \x escapes, so they are portable to pre-C11
+   compilers and can be concatenated with ordinary string literals.  */
+#define uLSQM "\xE2\x80\x98" /* U+2018 LEFT SINGLE QUOTATION MARK */
+#define uRSQM "\xE2\x80\x99" /* U+2019 RIGHT SINGLE QUOTATION MARK */
+
 /* Nonzero iff C is a character that corresponds to a raw 8-bit
    byte.  */
 #define CHAR_BYTE8_P(c) ((c) > MAX_5_BYTE_CHAR)
diff --git a/src/charset.c b/src/charset.c
index b19e34400fe..eeebf172bdf 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -555,7 +555,7 @@ load_charset_map_from_vector (struct charset *charset, Lisp_Object vec, int cont
 
   if (len % 2 == 1)
     {
-      add_to_log ("Failure in loading charset map: %V", vec, Qnil);
+      add_to_log ("Failure in loading charset map: %V", vec);
       return;
     }
 
diff --git a/src/composite.c b/src/composite.c
index 1c18165599d..88cef222d3a 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -927,7 +927,7 @@ char_composable_p (int c)
 {
   Lisp_Object val;
   return (c > ' '
-          && (c == 0x200C || c == 0x200D
+          && (c == ZERO_WIDTH_NON_JOINER || c == ZERO_WIDTH_JOINER
               || (val = CHAR_TABLE_REF (Vunicode_category_table, c),
                   (INTEGERP (val) && (XINT (val) <= UNICODE_CATEGORY_So)))));
 }
diff --git a/src/dispnew.c b/src/dispnew.c
index 7833fe3d01c..18afe50dd9b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -177,7 +177,7 @@ add_window_display_history (struct window *w, const char *msg, bool paused_p)
   ++history_idx;
 
   snprintf (buf, sizeof redisplay_history[0].trace,
-            "%"pMu": window %p (`%s')%s\n%s",
+            "%"pMu": window %p (%s)%s\n%s",
             history_tick++,
             ptr,
             ((BUFFERP (w->contents)
diff --git a/src/doc.c b/src/doc.c
index 36619e1142e..9c9bdf3997a 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -684,18 +684,37 @@ the same file name is found in the `doc-directory'.  */)
   return unbind_to (count, Qnil);
 }
 
-/* Declare named constants for U+2018 LEFT SINGLE QUOTATION MARK and
-   U+2019 RIGHT SINGLE QUOTATION MARK, which have UTF-8 encodings
-   "\xE2\x80\x98" and "\xE2\x80\x99", respectively.  */
-enum
-  {
-    LEFT_SINGLE_QUOTATION_MARK = 0x2018,
-    uLSQM0 = 0xE2, uLSQM1 = 0x80, uLSQM2 = 0x98,
-    uRSQM0 = 0xE2, uRSQM1 = 0x80, uRSQM2 = 0x99,
-  };
+/* Curved quotation marks.  */
 static unsigned char const LSQM[] = { uLSQM0, uLSQM1, uLSQM2 };
 static unsigned char const RSQM[] = { uRSQM0, uRSQM1, uRSQM2 };
 
+static bool
+default_to_grave_quoting_style (void)
+{
+  if (!text_quoting_flag)
+    return true;
+  if (! DISP_TABLE_P (Vstandard_display_table))
+    return false;
+  Lisp_Object dv = DISP_CHAR_VECTOR (XCHAR_TABLE (Vstandard_display_table),
+                                     LEFT_SINGLE_QUOTATION_MARK);
+  return (VECTORP (dv) && ASIZE (dv) == 1
+          && EQ (AREF (dv, 0), make_number ('`')));
+}
+
+/* Return the current effective text quoting style.  */
+enum text_quoting_style
+text_quoting_style (void)
+{
+  if (NILP (Vtext_quoting_style)
+      ? default_to_grave_quoting_style ()
+      : EQ (Vtext_quoting_style, Qgrave))
+    return GRAVE_QUOTING_STYLE;
+  else if (EQ (Vtext_quoting_style, Qstraight))
+    return STRAIGHT_QUOTING_STYLE;
+  else
+    return CURVE_QUOTING_STYLE;
+}
+
 DEFUN ("substitute-command-keys", Fsubstitute_command_keys,
        Ssubstitute_command_keys, 1, 1, 0,
        doc: /* Substitute key descriptions for command names in STRING.
@@ -750,20 +769,7 @@ Otherwise, return a new string.  */)
   name = Qnil;
   GCPRO4 (string, tem, keymap, name);
 
-  enum { unicode, grave_accent, apostrophe } quote_translation = unicode;
-  if (EQ (Vtext_quoting_style, Qgrave))
-    quote_translation = grave_accent;
-  else if (EQ (Vtext_quoting_style, Qstraight))
-    quote_translation = apostrophe;
-  else if (NILP (Vtext_quoting_style)
-           && DISP_TABLE_P (Vstandard_display_table))
-    {
-      Lisp_Object dv = DISP_CHAR_VECTOR (XCHAR_TABLE (Vstandard_display_table),
-                                         LEFT_SINGLE_QUOTATION_MARK);
-      if (VECTORP (dv) && ASIZE (dv) == 1
-          && EQ (AREF (dv, 0), make_number ('`')))
-        quote_translation = grave_accent;
-    }
+  enum text_quoting_style quoting_style = text_quoting_style ();
 
   multibyte = STRING_MULTIBYTE (string);
   nchars = 0;
@@ -921,11 +927,13 @@ Otherwise, return a new string.  */)
           if (NILP (tem))
             {
               name = Fsymbol_name (name);
-              insert_string ("\nUses keymap `");
+              insert1 (CALLN (Fformat, build_string ("\nUses keymap "uLSQM)));
               insert_from_string (name, 0, 0,
                                   SCHARS (name),
                                   SBYTES (name), 1);
-              insert_string ("', which is not currently defined.\n");
+              insert1 (CALLN (Fformat,
+                              (build_string
+                               (uRSQM", which is not currently defined.\n"))));
               if (start[-1] == '<') keymap = Qnil;
             }
           else if (start[-1] == '<')
@@ -962,7 +970,7 @@ Otherwise, return a new string.  */)
             strp = SDATA (string) + idx;
           }
         }
-      else if (strp[0] == '`' && quote_translation == unicode)
+      else if (strp[0] == '`' && quoting_style == CURVE_QUOTING_STYLE)
         {
           in_quote = true;
           start = LSQM;
@@ -972,7 +980,7 @@ Otherwise, return a new string.  */)
           idx = strp - SDATA (string) + 1;
           goto subst;
         }
-      else if (strp[0] == '`' && quote_translation == apostrophe)
+      else if (strp[0] == '`' && quoting_style == STRAIGHT_QUOTING_STYLE)
         {
           *bufp++ = '\'';
           strp++;
@@ -987,9 +995,9 @@ Otherwise, return a new string.  */)
         }
       else if (strp[0] == uLSQM0 && strp[1] == uLSQM1
                && (strp[2] == uLSQM2 || strp[2] == uRSQM2)
-               && quote_translation != unicode)
+               && quoting_style != CURVE_QUOTING_STYLE)
         {
-          *bufp++ = (strp[2] == uLSQM2 && quote_translation == grave_accent
+          *bufp++ = (strp[2] == uLSQM2 && quoting_style == GRAVE_QUOTING_STYLE
                      ? '`' : '\'');
           strp += 3;
           nchars++;
@@ -1044,6 +1052,10 @@ The default value nil acts like ‘curve’ if curved single quotes are
 displayable, and like ‘grave’ otherwise.  */);
   Vtext_quoting_style = Qnil;
 
+  DEFVAR_BOOL ("internal--text-quoting-flag", text_quoting_flag,
+               doc: /* If nil, a nil ‘text-quoting-style’ is treated as ‘grave’.  */);
+  /* Initialized by ‘main’.  */
+
   defsubr (&Sdocumentation);
   defsubr (&Sdocumentation_property);
   defsubr (&Ssnarf_documentation);
diff --git a/src/doprnt.c b/src/doprnt.c
index 68750f519e6..7c5a6afb94b 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -49,8 +49,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    support features beyond those in `Fformat', which is used by `error' on the
    Lisp level.  */
 
-/* This function supports the following %-sequences in the `format'
-   argument:
+/* In the FORMAT argument this function supports ` and ' as directives
+   that output left and right quotes as per ‘text-quoting style’.  It
+   also supports the following %-sequences:
 
    %s means print a string argument.
    %S is silently treated as %s, for loose compatibility with `Fformat'.
@@ -144,6 +145,7 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
   /* Buffer we have got with malloc.  */
   char *big_buffer = NULL;
 
+  enum text_quoting_style quoting_style = text_quoting_style ();
   ptrdiff_t tem = -1;
   char *string;
   char fixed_buffer[20];        /* Default buffer for small formatting. */
@@ -164,7 +166,9 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
   /* Loop until end of format string or buffer full. */
   while (fmt < format_end && bufsize > 0)
     {
-      if (*fmt == '%')  /* Check for a '%' character */
+      char const *fmt0 = fmt;
+      char fmtchar = *fmt++;
+      if (fmtchar == '%')
         {
           ptrdiff_t size_bound = 0;
           ptrdiff_t width;  /* Columns occupied by STRING on display.  */
@@ -180,7 +184,6 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
           int maxmlen = max (max (1, pDlen), max (pIlen, pMlen));
           int mlen;
 
-          fmt++;
           /* Copy this one %-spec into fmtcpy.  */
           string = fmtcpy;
           *string++ = '%';
@@ -438,22 +441,36 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
             }
         }
 
-      {
-        /* Just some character; Copy it if the whole multi-byte form
-           fit in the buffer.  */
-        char *save_bufptr = bufptr;
-
-        do { *bufptr++ = *fmt++; }
-        while (fmt < format_end && --bufsize > 0 && !CHAR_HEAD_P (*fmt));
-        if (!CHAR_HEAD_P (*fmt))
-          {
-            /* Truncate, but return value that will signal to caller
-               that the buffer was too small.  */
-            *save_bufptr = 0;
-            break;
-          }
-      }
-    };
+      char const *src;
+      ptrdiff_t srclen;
+      if (quoting_style == CURVE_QUOTING_STYLE && fmtchar == '`')
+        src = uLSQM, srclen = sizeof uLSQM - 1;
+      else if (quoting_style == CURVE_QUOTING_STYLE && fmtchar == '\'')
+        src = uRSQM, srclen = sizeof uRSQM - 1;
+      else if (quoting_style == STRAIGHT_QUOTING_STYLE && fmtchar == '`')
+        src = "'", srclen = 1;
+      else
+        {
+          while (fmt < format_end && !CHAR_HEAD_P (*fmt))
+            fmt++;
+          src = fmt0, srclen = fmt - fmt0;
+        }
+
+      if (bufsize < srclen)
+        {
+          /* Truncate, but return value that will signal to caller
+             that the buffer was too small.  */
+          do
+            *bufptr++ = '\0';
+          while (--bufsize != 0);
+        }
+      else
+        {
+          do
+            *bufptr++ = *src++;
+          while (--srclen != 0);
+        }
+    }
 
   /* If we had to malloc something, free it.  */
   xfree (big_buffer);
@@ -467,7 +484,8 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
 /* Format to an unbounded buffer BUF.  This is like sprintf, except it
    is not limited to returning an 'int' so it doesn't have a silly 2
    GiB limit on typical 64-bit hosts.  However, it is limited to the
-   Emacs-style formats that doprnt supports.
+   Emacs-style formats that doprnt supports, and it requotes ` and '
+   as per ‘text-quoting-style’.
 
    Return the number of bytes put into BUF, excluding the terminating
    '\0'.  */
diff --git a/src/editfns.c b/src/editfns.c
index 9ff39f9bf19..ed57d8aee09 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3800,8 +3800,9 @@ DEFUN ("format", Fformat, Sformat, 1, MANY, 0,
 The first argument is a format control string.
 The other arguments are substituted into it to make the result, a string.
 
-The format control string may contain %-sequences meaning to substitute
-the next available argument:
+The format control string may contain ordinary characters,
+%-sequences meaning to substitute the next available argument,
+and curved single quotation marks meaning to substitute quotes.
 
 %s means print a string argument.  Actually, prints any object, with `princ'.
 %d means print as number in decimal (%o octal, %x hex).
@@ -3846,6 +3847,12 @@ precision specifier says how many decimal places to show; if zero, the
 decimal point itself is omitted.  For %s and %S, the precision
 specifier truncates the string to the given width.
 
+\\=‘ and \\=’ means print left and right quotes as per
+‘text-quoting-style’.
+
+Return the first argument if it contains no format directives.
+Otherwise, return a new string.
+
 usage: (format STRING &rest OBJECTS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
@@ -3858,6 +3865,7 @@ usage: (format STRING &rest OBJECTS)  */)
   ptrdiff_t buf_save_value_index IF_LINT (= 0);
   char *format, *end, *format_start;
   ptrdiff_t formatlen, nchars;
+  bool changed = false;
   /* True if the format is multibyte.  */
   bool multibyte_format = 0;
   /* True if the output should be a multibyte string,
@@ -3921,6 +3929,8 @@ usage: (format STRING &rest OBJECTS)  */)
     if (STRINGP (args[n]) && STRING_MULTIBYTE (args[n]))
       multibyte = 1;
 
+  enum text_quoting_style quoting_style = text_quoting_style ();
+
   /* If we start out planning a unibyte result,
      then discover it has to be multibyte, we jump back to retry.  */
  retry:
@@ -4005,6 +4015,7 @@ usage: (format STRING &rest OBJECTS)  */)
           if (format == end)
             error ("Format string ends in middle of format specifier");
 
+          changed = true;
           memset (&discarded[format0 - format_start], 1, format - format0);
           conversion = *format;
           if (conversion == '%')
@@ -4426,6 +4437,20 @@ usage: (format STRING &rest OBJECTS)  */)
 
               convbytes = format - src;
               memset (&discarded[src + 1 - format_start], 2, convbytes - 1);
+
+              if (quoting_style != CURVE_QUOTING_STYLE && convbytes == 3
+                  && (unsigned char) src[0] == uLSQM0
+                  && (unsigned char) src[1] == uLSQM1
+                  && ((unsigned char) src[2] == uLSQM2
+                      || (unsigned char) src[2] == uRSQM2))
+                {
+                  convbytes = 1;
+                  str[0] = (((unsigned char) src[2] == uLSQM2
+                             && quoting_style == GRAVE_QUOTING_STYLE)
+                            ? '`' : '\'');
+                  src = (char *) str;
+                  changed = true;
+                }
             }
           else
             {
@@ -4437,6 +4462,7 @@ usage: (format STRING &rest OBJECTS)  */)
                   int c = BYTE8_TO_CHAR (uc);
                   convbytes = CHAR_STRING (c, str);
                   src = (char *) str;
+                  changed = true;
                 }
             }
 
@@ -4484,113 +4510,119 @@ usage: (format STRING &rest OBJECTS)  */)
   if (bufsize < p - buf)
     emacs_abort ();
 
-  if (maybe_combine_byte)
-    nchars = multibyte_chars_in_text ((unsigned char *) buf, p - buf);
-  val = make_specified_string (buf, nchars, p - buf, multibyte);
-
-  /* If the format string has text properties, or any of the string
-     arguments has text properties, set up text properties of the
-     result string.  */
-
-  if (string_intervals (args[0]) || arg_intervals)
+  if (!changed)
+    val = args[0];
+  else
     {
-      Lisp_Object len, new_len, props;
-      struct gcpro gcpro1;
+      if (maybe_combine_byte)
+        nchars = multibyte_chars_in_text ((unsigned char *) buf, p - buf);
+      val = make_specified_string (buf, nchars, p - buf, multibyte);
 
-      /* Add text properties from the format string.  */
-      len = make_number (SCHARS (args[0]));
-      props = text_property_list (args[0], make_number (0), len, Qnil);
-      GCPRO1 (props);
+      /* If the format string has text properties, or any of the string
+         arguments has text properties, set up text properties of the
+         result string.  */
 
-      if (CONSP (props))
+      if (string_intervals (args[0]) || arg_intervals)
         {
-          ptrdiff_t bytepos = 0, position = 0, translated = 0;
-          ptrdiff_t argn = 1;
-          Lisp_Object list;
-
-          /* Adjust the bounds of each text property
-             to the proper start and end in the output string.  */
-
-          /* Put the positions in PROPS in increasing order, so that
-             we can do (effectively) one scan through the position
-             space of the format string.  */
-          props = Fnreverse (props);
-
-          /* BYTEPOS is the byte position in the format string,
-             POSITION is the untranslated char position in it,
-             TRANSLATED is the translated char position in BUF,
-             and ARGN is the number of the next arg we will come to.  */
-          for (list = props; CONSP (list); list = XCDR (list))
+          Lisp_Object len, new_len, props;
+          struct gcpro gcpro1;
+
+          /* Add text properties from the format string.  */
+          len = make_number (SCHARS (args[0]));
+          props = text_property_list (args[0], make_number (0), len, Qnil);
+          GCPRO1 (props);
+
+          if (CONSP (props))
             {
-              Lisp_Object item;
-              ptrdiff_t pos;
+              ptrdiff_t bytepos = 0, position = 0, translated = 0;
+              ptrdiff_t argn = 1;
+              Lisp_Object list;
+
+              /* Adjust the bounds of each text property
+                 to the proper start and end in the output string.  */
+
+              /* Put the positions in PROPS in increasing order, so that
+                 we can do (effectively) one scan through the position
+                 space of the format string.  */
+              props = Fnreverse (props);
+
+              /* BYTEPOS is the byte position in the format string,
+                 POSITION is the untranslated char position in it,
+                 TRANSLATED is the translated char position in BUF,
+                 and ARGN is the number of the next arg we will come to.  */
+              for (list = props; CONSP (list); list = XCDR (list))
+                {
+                  Lisp_Object item;
+                  ptrdiff_t pos;
 
-              item = XCAR (list);
+                  item = XCAR (list);
 
-              /* First adjust the property start position.  */
-              pos = XINT (XCAR (item));
+                  /* First adjust the property start position.  */
+                  pos = XINT (XCAR (item));
 
-              /* Advance BYTEPOS, POSITION, TRANSLATED and ARGN
-                 up to this position.  */
-              for (; position < pos; bytepos++)
-                {
-                  if (! discarded[bytepos])
-                    position++, translated++;
-                  else if (discarded[bytepos] == 1)
+                  /* Advance BYTEPOS, POSITION, TRANSLATED and ARGN
+                     up to this position.  */
+                  for (; position < pos; bytepos++)
                     {
-                      position++;
-                      if (translated == info[argn].start)
+                      if (! discarded[bytepos])
+                        position++, translated++;
+                      else if (discarded[bytepos] == 1)
                         {
-                          translated += info[argn].end - info[argn].start;
-                          argn++;
+                          position++;
+                          if (translated == info[argn].start)
+                            {
+                              translated += info[argn].end - info[argn].start;
+                              argn++;
+                            }
                         }
                     }
-                }
 
-              XSETCAR (item, make_number (translated));
+                  XSETCAR (item, make_number (translated));
 
-              /* Likewise adjust the property end position.  */
-              pos = XINT (XCAR (XCDR (item)));
+                  /* Likewise adjust the property end position.  */
+                  pos = XINT (XCAR (XCDR (item)));
 
-              for (; position < pos; bytepos++)
-                {
-                  if (! discarded[bytepos])
-                    position++, translated++;
-                  else if (discarded[bytepos] == 1)
+                  for (; position < pos; bytepos++)
                     {
-                      position++;
-                      if (translated == info[argn].start)
+                      if (! discarded[bytepos])
+                        position++, translated++;
+                      else if (discarded[bytepos] == 1)
                         {
-                          translated += info[argn].end - info[argn].start;
-                          argn++;
+                          position++;
+                          if (translated == info[argn].start)
+                            {
+                              translated += info[argn].end - info[argn].start;
+                              argn++;
+                            }
                         }
                     }
+
+                  XSETCAR (XCDR (item), make_number (translated));
                 }
 
-              XSETCAR (XCDR (item), make_number (translated));
+              add_text_properties_from_list (val, props, make_number (0));
             }
 
-          add_text_properties_from_list (val, props, make_number (0));
-        }
-
-      /* Add text properties from arguments.  */
-      if (arg_intervals)
-        for (n = 1; n < nargs; ++n)
-          if (info[n].intervals)
-            {
-              len = make_number (SCHARS (args[n]));
-              new_len = make_number (info[n].end - info[n].start);
-              props = text_property_list (args[n], make_number (0), len, Qnil);
-              props = extend_property_ranges (props, new_len);
-              /* If successive arguments have properties, be sure that
-                 the value of `composition' property be the copy.  */
-              if (n > 1 && info[n - 1].end)
-                make_composition_value_copy (props);
-              add_text_properties_from_list (val, props,
-                                             make_number (info[n].start));
-            }
+          /* Add text properties from arguments.  */
+          if (arg_intervals)
+            for (n = 1; n < nargs; ++n)
+              if (info[n].intervals)
+                {
+                  len = make_number (SCHARS (args[n]));
+                  new_len = make_number (info[n].end - info[n].start);
+                  props = text_property_list (args[n], make_number (0),
+                                              len, Qnil);
+                  props = extend_property_ranges (props, new_len);
+                  /* If successive arguments have properties, be sure that
+                     the value of `composition' property be the copy.  */
+                  if (n > 1 && info[n - 1].end)
+                    make_composition_value_copy (props);
+                  add_text_properties_from_list (val, props,
+                                                 make_number (info[n].start));
+                }
 
-      UNGCPRO;
+          UNGCPRO;
+        }
     }
 
   /* If we allocated BUF or INFO with malloc, free it too.  */
diff --git a/src/emacs.c b/src/emacs.c
index 6e35496eb8a..1392209f585 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -95,6 +95,10 @@ extern void moncontrol (int mode);
 #include <locale.h>
 #endif
 
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
 #ifdef HAVE_SETRLIMIT
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -344,6 +348,19 @@ setlocale (int cat, char const *locale)
 }
 #endif
 
+/* True if the current system locale uses UTF-8 encoding.  */
+static bool
+using_utf8 (void)
+{
+#ifdef HAVE_WCHAR_H
+  wchar_t wc;
+  mbstate_t mbs = { 0 };
+  return mbrtowc (&wc, "\xc4\x80", 2, &mbs) == 2 && wc == 0x100;
+#else
+  return false;
+#endif
+}
+
 
 /* Report a fatal error due to signal SIG, output a backtrace of at
    most BACKTRACE_LIMIT lines, and exit.  */
@@ -924,6 +941,7 @@ main (int argc, char **argv)
      fixup_locale must wait until later, since it builds strings.  */
   if (do_initial_setlocale)
     setlocale (LC_ALL, "");
+  text_quoting_flag = using_utf8 ();
 
   inhibit_window_system = 0;
 
@@ -2154,17 +2172,23 @@ synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_loca
 {
   if (! EQ (*plocale, desired_locale))
     {
+      *plocale = desired_locale;
 #ifdef WINDOWSNT
       /* Changing categories like LC_TIME usually requires to specify
          an encoding suitable for the new locale, but MS-Windows's
          'setlocale' will only switch the encoding when LC_ALL is
-         specified.  So we ignore CATEGORY and use LC_ALL instead.  */
-      category = LC_ALL;
-#endif
-      *plocale = desired_locale;
+         specified.  So we ignore CATEGORY, use LC_ALL instead, and
+         then restore LC_NUMERIC to "C", so reading and printing
+         numbers is unaffected.  */
+      setlocale (LC_ALL, (STRINGP (desired_locale)
+                          ? SSDATA (desired_locale)
+                          : ""));
+      fixup_locale ();
+#else  /* !WINDOWSNT */
       setlocale (category, (STRINGP (desired_locale)
                             ? SSDATA (desired_locale)
                             : ""));
+#endif  /* !WINDOWSNT */
     }
 }
 
@@ -2423,7 +2447,7 @@ Special values:
 Anything else (in Emacs 24.1, the possibilities are: aix, berkeley-unix,
 hpux, irix, usg-unix-v) indicates some sort of Unix system.  */);
   Vsystem_type = intern_c_string (SYSTEM_TYPE);
-  /* See configure.ac (and config.nt) for the possible SYSTEM_TYPEs.  */
+  /* See configure.ac for the possible SYSTEM_TYPEs.  */
 
   DEFVAR_LISP ("system-configuration", Vsystem_configuration,
                doc: /* Value is string indicating configuration Emacs was built for.  */);
diff --git a/src/image.c b/src/image.c
index 066db74f786..fb8c6e79168 100644
--- a/src/image.c
+++ b/src/image.c
@@ -629,16 +629,19 @@ valid_image_p (Lisp_Object object)
 }
 
 
-/* Log error message with format string FORMAT and argument ARG.
+/* Log error message with format string FORMAT and trailing arguments.
    Signaling an error, e.g. when an image cannot be loaded, is not a
    good idea because this would interrupt redisplay, and the error
    message display would lead to another redisplay.  This function
    therefore simply displays a message.  */
 
 static void
-image_error (const char *format, Lisp_Object arg1, Lisp_Object arg2)
+image_error (const char *format, ...)
 {
-  add_to_log (format, arg1, arg2);
+  va_list ap;
+  va_start (ap, format);
+  vadd_to_log (format, ap);
+  va_end (ap);
 }
 
 
@@ -1954,7 +1957,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
                         depth > 16 ? 32 : depth > 8 ? 16 : 8, 0);
   if (*ximg == NULL)
     {
-      image_error ("Unable to allocate X image", Qnil, Qnil);
+      image_error ("Unable to allocate X image");
       return 0;
     }
 
@@ -1976,7 +1979,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
     {
       x_destroy_x_image (*ximg);
       *ximg = NULL;
-      image_error ("Unable to create X pixmap", Qnil, Qnil);
+      image_error ("Unable to create X pixmap");
       return 0;
     }
 
@@ -1997,7 +2000,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
   if (depth != 1 && depth != 4 && depth != 8
       && depth != 16 && depth != 24 && depth != 32)
     {
-      image_error ("Invalid image bit depth specified", Qnil, Qnil);
+      image_error ("Invalid image bit depth specified");
       return 0;
     }
 
@@ -2055,7 +2058,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
       Lisp_Object errcode;
       /* All system errors are < 10000, so the following is safe.  */
       XSETINT (errcode, err);
-      image_error ("Unable to create bitmap, error code %d", errcode, Qnil);
+      image_error ("Unable to create bitmap, error code %d", errcode);
       x_destroy_x_image (*ximg);
       *ximg = NULL;
       return 0;
@@ -2070,7 +2073,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
   if (*pixmap == 0)
     {
       *ximg = NULL;
-      image_error ("Unable to allocate NSImage for XPM pixmap", Qnil, Qnil);
+      image_error ("Unable to allocate NSImage for XPM pixmap");
       return 0;
     }
   *ximg = *pixmap;
@@ -2791,7 +2794,7 @@ xbm_read_bitmap_data (struct frame *f, unsigned char *contents, unsigned char *e
   if (!check_image_size (f, *width, *height))
     {
       if (!inhibit_image_error)
-        image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+        image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       goto failure;
     }
   else if (data == NULL)
@@ -2936,13 +2939,14 @@ xbm_load_image (struct frame *f, struct image *img, unsigned char *contents,
       if (img->pixmap == NO_PIXMAP)
         {
           x_clear_image (f, img);
-          image_error ("Unable to create X pixmap for `%s'", img->spec, Qnil);
+          image_error ("Unable to create X pixmap for "uLSQM"%s"uRSQM,
+                       img->spec);
         }
       else
         success_p = 1;
     }
   else
-    image_error ("Error loading XBM image `%s'", img->spec, Qnil);
+    image_error ("Error loading XBM image "uLSQM"%s"uRSQM, img->spec);
 
   return success_p;
 }
@@ -2983,14 +2987,14 @@ xbm_load (struct frame *f, struct image *img)
       file = x_find_image_file (file_name);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", file_name, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM, file_name);
           return 0;
         }
 
       contents = slurp_file (SSDATA (file), &size);
       if (contents == NULL)
         {
-          image_error ("Error loading XBM image `%s'", img->spec, Qnil);
+          image_error ("Error loading XBM image "uLSQM"%s"uRSQM, img->spec);
           return 0;
         }
 
@@ -3025,8 +3029,8 @@ xbm_load (struct frame *f, struct image *img)
           eassert (img->width > 0 && img->height > 0);
           if (!check_image_size (f, img->width, img->height))
             {
-              image_error ("Invalid image size (see `max-image-size')",
-                           Qnil, Qnil);
+              image_error ("Invalid image size (see "
+                           uLSQM"max-image-size"uRSQM")");
               return 0;
             }
         }
@@ -3103,8 +3107,9 @@ xbm_load (struct frame *f, struct image *img)
             success_p = 1;
           else
             {
-              image_error ("Unable to create pixmap for XBM image `%s'",
-                           img->spec, Qnil);
+              image_error (("Unable to create pixmap for XBM image "
+                            uLSQM"%s"uRSQM),
+                           img->spec);
               x_clear_image (f, img);
             }
 
@@ -3626,7 +3631,8 @@ xpm_load (struct frame *f, struct image *img)
       Lisp_Object file = x_find_image_file (specified_file);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", specified_file, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM,
+                       specified_file);
 #ifdef ALLOC_XPM_COLORS
           xpm_free_color_cache ();
 #endif
@@ -3657,7 +3663,7 @@ xpm_load (struct frame *f, struct image *img)
       Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL);
       if (!STRINGP (buffer))
         {
-          image_error ("Invalid image data `%s'", buffer, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, buffer);
 #ifdef ALLOC_XPM_COLORS
           xpm_free_color_cache ();
 #endif
@@ -3815,23 +3821,23 @@ xpm_load (struct frame *f, struct image *img)
       switch (rc)
         {
         case XpmOpenFailed:
-          image_error ("Error opening XPM file (%s)", img->spec, Qnil);
+          image_error ("Error opening XPM file (%s)", img->spec);
           break;
 
         case XpmFileInvalid:
-          image_error ("Invalid XPM file (%s)", img->spec, Qnil);
+          image_error ("Invalid XPM file (%s)", img->spec);
           break;
 
         case XpmNoMemory:
-          image_error ("Out of memory (%s)", img->spec, Qnil);
+          image_error ("Out of memory (%s)", img->spec);
           break;
 
         case XpmColorFailed:
-          image_error ("Color allocation error (%s)", img->spec, Qnil);
+          image_error ("Color allocation error (%s)", img->spec);
           break;
 
         default:
-          image_error ("Unknown error (%s)", img->spec, Qnil);
+          image_error ("Unknown error (%s)", img->spec);
           break;
         }
     }
@@ -4101,7 +4107,7 @@ xpm_load_image (struct frame *f,
 
   if (!check_image_size (f, width, height))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       goto failure;
     }
 
@@ -4112,7 +4118,7 @@ xpm_load_image (struct frame *f,
 #endif
       )
     {
-      image_error ("Image too large", Qnil, Qnil);
+      image_error ("Image too large");
       goto failure;
     }
 
@@ -4262,7 +4268,7 @@ xpm_load_image (struct frame *f,
   return 1;
 
  failure:
-  image_error ("Invalid XPM file (%s)", img->spec, Qnil);
+  image_error ("Invalid XPM file (%s)", img->spec);
   x_destroy_x_image (ximg);
   x_destroy_x_image (mask_img);
   x_clear_image (f, img);
@@ -4291,14 +4297,14 @@ xpm_load (struct frame *f,
       file = x_find_image_file (file_name);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", file_name, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM, file_name);
           return 0;
         }
 
       contents = slurp_file (SSDATA (file), &size);
       if (contents == NULL)
         {
-          image_error ("Error loading XPM image `%s'", img->spec, Qnil);
+          image_error ("Error loading XPM image "uLSQM"%s"uRSQM, img->spec);
           return 0;
         }
 
@@ -4312,7 +4318,7 @@ xpm_load (struct frame *f,
       data = image_spec_value (img->spec, QCdata, NULL);
       if (!STRINGP (data))
         {
-          image_error ("Invalid image data `%s'", data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, data);
           return 0;
         }
       success_p = xpm_load_image (f, img, SDATA (data),
@@ -4734,7 +4740,7 @@ XPutPixel (XImagePtr ximg, int x, int y, COLORREF color)
         *pixel = *pixel & ~(1 << x % 8);
     }
   else
-    image_error ("XPutPixel: palette image not supported", Qnil, Qnil);
+    image_error ("XPutPixel: palette image not supported");
 }
 
 #endif /* HAVE_NTGUI */
@@ -5266,14 +5272,15 @@ pbm_load (struct frame *f, struct image *img)
       file = x_find_image_file (specified_file);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", specified_file, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM,
+                       specified_file);
           return 0;
         }
 
       contents = slurp_file (SSDATA (file), &size);
       if (contents == NULL)
         {
-          image_error ("Error reading `%s'", file, Qnil);
+          image_error ("Error reading "uLSQM"%s"uRSQM, file);
           return 0;
         }
 
@@ -5286,7 +5293,7 @@ pbm_load (struct frame *f, struct image *img)
       data = image_spec_value (img->spec, QCdata, NULL);
       if (!STRINGP (data))
         {
-          image_error ("Invalid image data `%s'", data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, data);
           return 0;
         }
       p = SDATA (data);
@@ -5296,7 +5303,7 @@ pbm_load (struct frame *f, struct image *img)
   /* Check magic number.  */
   if (end - p < 2 || *p++ != 'P')
     {
-      image_error ("Not a PBM image: `%s'", img->spec, Qnil);
+      image_error ("Not a PBM image: "uLSQM"%s"uRSQM, img->spec);
     error:
       xfree (contents);
       img->pixmap = NO_PIXMAP;
@@ -5330,7 +5337,7 @@ pbm_load (struct frame *f, struct image *img)
       break;
 
     default:
-      image_error ("Not a PBM image: `%s'", img->spec, Qnil);
+      image_error ("Not a PBM image: "uLSQM"%s"uRSQM, img->spec);
       goto error;
     }
 
@@ -5349,14 +5356,14 @@ pbm_load (struct frame *f, struct image *img)
       max_color_idx = pbm_scan_number (&p, end);
       if (max_color_idx > 65535 || max_color_idx < 0)
         {
-          image_error ("Unsupported maximum PBM color value", Qnil, Qnil);
+          image_error ("Unsupported maximum PBM color value");
           goto error;
         }
     }
 
   if (!check_image_size (f, width, height))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       goto error;
     }
 
@@ -5429,8 +5436,9 @@ pbm_load (struct frame *f, struct image *img)
                         x_destroy_x_image (ximg);
 #endif
                         x_clear_image (f, img);
-                        image_error ("Invalid image size in image `%s'",
-                                     img->spec, Qnil);
+                        image_error (("Invalid image size in image "
+                                      uLSQM"%s"uRSQM),
+                                     img->spec);
                         goto error;
                       }
                     c = *p++;
@@ -5464,8 +5472,8 @@ pbm_load (struct frame *f, struct image *img)
           x_destroy_x_image (ximg);
 #endif
           x_clear_image (f, img);
-          image_error ("Invalid image size in image `%s'",
-                       img->spec, Qnil);
+          image_error ("Invalid image size in image "uLSQM"%s"uRSQM,
+                       img->spec);
           goto error;
         }
 
@@ -5508,8 +5516,8 @@ pbm_load (struct frame *f, struct image *img)
 #else
                 x_destroy_x_image (ximg);
 #endif
-                image_error ("Invalid pixel value in image `%s'",
-                             img->spec, Qnil);
+                image_error ("Invalid pixel value in image "uLSQM"%s"uRSQM,
+                             img->spec);
                 goto error;
               }
 
@@ -5800,7 +5808,7 @@ my_png_error (png_struct *png_ptr, const char *msg)
   eassert (png_ptr != NULL);
   /* Avoid compiler warning about deprecated direct access to
      png_ptr's fields in libpng versions 1.4.x.  */
-  image_error ("PNG error: %s", build_string (msg), Qnil);
+  image_error ("PNG error: %s", build_string (msg));
   PNG_LONGJMP (png_ptr);
 }
 
@@ -5809,7 +5817,7 @@ static void
 my_png_warning (png_struct *png_ptr, const char *msg)
 {
   eassert (png_ptr != NULL);
-  image_error ("PNG warning: %s", build_string (msg), Qnil);
+  image_error ("PNG warning: %s", build_string (msg));
 }
 
 /* Memory source for PNG decoding.  */
@@ -5904,7 +5912,8 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
       file = x_find_image_file (specified_file);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", specified_file, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM,
+                       specified_file);
           return 0;
         }
 
@@ -5912,7 +5921,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
       fp = emacs_fopen (SSDATA (file), "rb");
       if (!fp)
         {
-          image_error ("Cannot open image file `%s'", file, Qnil);
+          image_error ("Cannot open image file "uLSQM"%s"uRSQM, file);
           return 0;
         }
 
@@ -5921,7 +5930,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
           || png_sig_cmp (sig, 0, sizeof sig))
         {
           fclose (fp);
-          image_error ("Not a PNG file: `%s'", file, Qnil);
+          image_error ("Not a PNG file: "uLSQM"%s"uRSQM, file);
           return 0;
         }
     }
@@ -5929,7 +5938,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
     {
       if (!STRINGP (specified_data))
         {
-          image_error ("Invalid image data `%s'", specified_data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, specified_data);
           return 0;
         }
 
@@ -5942,7 +5951,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
       if (tbr.len < sizeof sig
           || png_sig_cmp (tbr.bytes, 0, sizeof sig))
         {
-          image_error ("Not a PNG image: `%s'", img->spec, Qnil);
+          image_error ("Not a PNG image: "uLSQM"%s"uRSQM, img->spec);
           return 0;
         }
 
@@ -6010,7 +6019,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
   if (! (width <= INT_MAX && height <= INT_MAX
          && check_image_size (f, width, height)))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       goto error;
     }
 
@@ -6668,20 +6677,21 @@ jpeg_load_body (struct frame *f, struct image *img,
       file = x_find_image_file (specified_file);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", specified_file, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM,
+                       specified_file);
           return 0;
         }
 
       fp = emacs_fopen (SSDATA (file), "rb");
       if (fp == NULL)
         {
-          image_error ("Cannot open `%s'", file, Qnil);
+          image_error ("Cannot open "uLSQM"%s"uRSQM, file);
           return 0;
         }
     }
   else if (!STRINGP (specified_data))
     {
-      image_error ("Invalid image data `%s'", specified_data, Qnil);
+      image_error ("Invalid image data "uLSQM"%s"uRSQM, specified_data);
       return 0;
     }
 
@@ -6697,13 +6707,14 @@ jpeg_load_body (struct frame *f, struct image *img,
           {
             char buf[JMSG_LENGTH_MAX];
             mgr->cinfo.err->format_message ((j_common_ptr) &mgr->cinfo, buf);
-            image_error ("Error reading JPEG image `%s': %s", img->spec,
-                         build_string (buf));
+            image_error ("Error reading JPEG image "uLSQM"%s"uRSQM": %s",
+                         img->spec, build_string (buf));
             break;
           }
 
         case MY_JPEG_INVALID_IMAGE_SIZE:
-          image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+          image_error ("Invalid image size (see "
+                       uLSQM"max-image-size"uRSQM")");
           break;
 
         case MY_JPEG_CANNOT_CREATE_X:
@@ -7183,7 +7194,8 @@ tiff_load (struct frame *f, struct image *img)
       file = x_find_image_file (specified_file);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", specified_file, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM,
+                       specified_file);
           return 0;
         }
 # ifdef WINDOWSNT
@@ -7194,7 +7206,7 @@ tiff_load (struct frame *f, struct image *img)
       tiff = TIFFOpen (SSDATA (file), "r");
       if (tiff == NULL)
         {
-          image_error ("Cannot open `%s'", file, Qnil);
+          image_error ("Cannot open "uLSQM"%s"uRSQM, file);
           return 0;
         }
     }
@@ -7202,7 +7214,7 @@ tiff_load (struct frame *f, struct image *img)
     {
       if (!STRINGP (specified_data))
         {
-          image_error ("Invalid image data `%s'", specified_data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, specified_data);
           return 0;
         }
 
@@ -7222,7 +7234,8 @@ tiff_load (struct frame *f, struct image *img)
 
       if (!tiff)
         {
-          image_error ("Cannot open memory source for `%s'", img->spec, Qnil);
+          image_error ("Cannot open memory source for "uLSQM"%s"uRSQM,
+                       img->spec);
           return 0;
         }
     }
@@ -7234,8 +7247,9 @@ tiff_load (struct frame *f, struct image *img)
       if (! (TYPE_MINIMUM (tdir_t) <= ino && ino <= TYPE_MAXIMUM (tdir_t)
              && TIFFSetDirectory (tiff, ino)))
         {
-          image_error ("Invalid image number `%s' in image `%s'",
-                       image, img->spec);
+          image_error
+            ("Invalid image number "uLSQM"%s"uRSQM" in image "uLSQM"%s"uRSQM,
+             image, img->spec);
           TIFFClose (tiff);
           return 0;
         }
@@ -7248,7 +7262,7 @@ tiff_load (struct frame *f, struct image *img)
 
   if (!check_image_size (f, width, height))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       TIFFClose (tiff);
       return 0;
     }
@@ -7278,7 +7292,7 @@ tiff_load (struct frame *f, struct image *img)
   TIFFClose (tiff);
   if (!rc)
     {
-      image_error ("Error reading TIFF image `%s'", img->spec, Qnil);
+      image_error ("Error reading TIFF image "uLSQM"%s"uRSQM, img->spec);
       xfree (buf);
       return 0;
     }
@@ -7615,7 +7629,8 @@ gif_load (struct frame *f, struct image *img)
       file = x_find_image_file (specified_file);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", specified_file, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM,
+                       specified_file);
           return 0;
         }
 #ifdef WINDOWSNT
@@ -7627,14 +7642,14 @@ gif_load (struct frame *f, struct image *img)
       gif = DGifOpenFileName (SSDATA (file));
       if (gif == NULL)
         {
-          image_error ("Cannot open `%s'", file, Qnil);
+          image_error ("Cannot open "uLSQM"%s"uRSQM, file);
           return 0;
         }
 #else
       gif = DGifOpenFileName (SSDATA (file), &gif_err);
       if (gif == NULL)
         {
-          image_error ("Cannot open `%s': %s",
+          image_error ("Cannot open "uLSQM"%s"uRSQM": %s",
                        file, build_string (GifErrorString (gif_err)));
           return 0;
         }
@@ -7644,7 +7659,7 @@ gif_load (struct frame *f, struct image *img)
     {
       if (!STRINGP (specified_data))
         {
-          image_error ("Invalid image data `%s'", specified_data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, specified_data);
           return 0;
         }
 
@@ -7658,14 +7673,14 @@ gif_load (struct frame *f, struct image *img)
       gif = DGifOpen (&memsrc, gif_read_from_memory);
       if (!gif)
         {
-          image_error ("Cannot open memory source `%s'", img->spec, Qnil);
+          image_error ("Cannot open memory source "uLSQM"%s"uRSQM, img->spec);
           return 0;
         }
 #else
       gif = DGifOpen (&memsrc, gif_read_from_memory, &gif_err);
       if (!gif)
         {
-          image_error ("Cannot open memory source `%s': %s",
+          image_error ("Cannot open memory source "uLSQM"%s"uRSQM": %s",
                        img->spec, build_string (GifErrorString (gif_err)));
           return 0;
         }
@@ -7675,7 +7690,7 @@ gif_load (struct frame *f, struct image *img)
   /* Before reading entire contents, check the declared image size. */
   if (!check_image_size (f, gif->SWidth, gif->SHeight))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       gif_close (gif, NULL);
       return 0;
     }
@@ -7684,7 +7699,7 @@ gif_load (struct frame *f, struct image *img)
   rc = DGifSlurp (gif);
   if (rc == GIF_ERROR || gif->ImageCount <= 0)
     {
-      image_error ("Error reading `%s'", img->spec, Qnil);
+      image_error ("Error reading "uLSQM"%s"uRSQM, img->spec);
       gif_close (gif, NULL);
       return 0;
     }
@@ -7695,8 +7710,9 @@ gif_load (struct frame *f, struct image *img)
     idx = INTEGERP (image_number) ? XFASTINT (image_number) : 0;
     if (idx < 0 || idx >= gif->ImageCount)
       {
-        image_error ("Invalid image number `%s' in image `%s'",
-                     image_number, img->spec);
+        image_error
+          ("Invalid image number "uLSQM"%s"uRSQM" in image "uLSQM"%s"uRSQM,
+           image_number, img->spec);
         gif_close (gif, NULL);
         return 0;
       }
@@ -7714,7 +7730,7 @@ gif_load (struct frame *f, struct image *img)
 
   if (!check_image_size (f, width, height))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       gif_close (gif, NULL);
       return 0;
     }
@@ -7732,7 +7748,7 @@ gif_load (struct frame *f, struct image *img)
              && 0 <= subimg_top && subimg_top <= height - subimg_height
              && 0 <= subimg_left && subimg_left <= width - subimg_width))
         {
-          image_error ("Subimage does not fit in image", Qnil, Qnil);
+          image_error ("Subimage does not fit in image");
           gif_close (gif, NULL);
           return 0;
         }
@@ -7968,10 +7984,10 @@ gif_load (struct frame *f, struct image *img)
       char *error_text = GifErrorString (gif_err);
 
       if (error_text)
-        image_error ("Error closing `%s': %s",
+        image_error ("Error closing "uLSQM"%s"uRSQM": %s",
                      img->spec, build_string (error_text));
 #else
-      image_error ("Error closing `%s'", img->spec, Qnil);
+      image_error ("Error closing "uLSQM"%s"uRSQM, img->spec);
 #endif
     }
 
@@ -8220,9 +8236,7 @@ imagemagick_error (MagickWand *wand)
   ExceptionType severity;
 
   description = MagickGetException (wand, &severity);
-  image_error ("ImageMagick error: %s",
-               build_string (description),
-               Qnil);
+  image_error ("ImageMagick error: %s", build_string (description));
   MagickRelinquishMemory (description);
 }
 
@@ -8383,8 +8397,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
           DestroyMagickWand (composite_wand);
           DestroyMagickWand (sub_wand);
           cache->wand = NULL;
-          image_error ("Imagemagick pixel iterator creation failed",
-                       Qnil, Qnil);
+          image_error ("Imagemagick pixel iterator creation failed");
           return NULL;
         }
 
@@ -8395,8 +8408,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
           DestroyMagickWand (sub_wand);
           DestroyPixelIterator (source_iterator);
           cache->wand = NULL;
-          image_error ("Imagemagick pixel iterator creation failed",
-                       Qnil, Qnil);
+          image_error ("Imagemagick pixel iterator creation failed");
           return NULL;
         }
 
@@ -8516,8 +8528,9 @@ imagemagick_load_image (struct frame *f, struct image *img,
 
   if (ino < 0 || ino >= MagickGetNumberImages (image_wand))
     {
-      image_error ("Invalid image number `%s' in image `%s'",
-                   image, img->spec);
+      image_error
+        ("Invalid image number "uLSQM"%s"uRSQM" in image "uLSQM"%s"uRSQM,
+         image, img->spec);
       DestroyMagickWand (image_wand);
       return 0;
     }
@@ -8571,7 +8584,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
       status = MagickScaleImage (image_wand, desired_width, desired_height);
       if (status == MagickFalse)
         {
-          image_error ("Imagemagick scale failed", Qnil, Qnil);
+          image_error ("Imagemagick scale failed");
           imagemagick_error (image_wand);
           goto imagemagick_error;
         }
@@ -8621,7 +8634,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
       status = MagickRotateImage (image_wand, bg_wand, rotation);
       if (status == MagickFalse)
         {
-          image_error ("Imagemagick image rotate failed", Qnil, Qnil);
+          image_error ("Imagemagick image rotate failed");
           imagemagick_error (image_wand);
           goto imagemagick_error;
         }
@@ -8651,7 +8664,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
   if (! (image_width <= INT_MAX && image_height <= INT_MAX
          && check_image_size (f, image_width, image_height)))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       goto imagemagick_error;
     }
 
@@ -8678,7 +8691,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 #ifdef COLOR_TABLE_SUPPORT
           free_color_table ();
 #endif
-          image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
+          image_error ("Imagemagick X bitmap allocation failure");
           goto imagemagick_error;
         }
 
@@ -8718,7 +8731,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 #ifdef COLOR_TABLE_SUPPORT
           free_color_table ();
 #endif
-          image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
+          image_error ("Imagemagick X bitmap allocation failure");
           goto imagemagick_error;
         }
 
@@ -8734,8 +8747,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
           free_color_table ();
 #endif
           x_destroy_x_image (ximg);
-          image_error ("Imagemagick pixel iterator creation failed",
-                       Qnil, Qnil);
+          image_error ("Imagemagick pixel iterator creation failed");
           goto imagemagick_error;
         }
 
@@ -8787,7 +8799,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 
   MagickWandTerminus ();
   /* TODO more cleanup.  */
-  image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil);
+  image_error ("Error parsing IMAGEMAGICK image "uLSQM"%s"uRSQM, img->spec);
   return 0;
 }
 
@@ -8811,7 +8823,7 @@ imagemagick_load (struct frame *f, struct image *img)
       file = x_find_image_file (file_name);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", file_name, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM, file_name);
           return 0;
         }
 #ifdef WINDOWSNT
@@ -8828,7 +8840,7 @@ imagemagick_load (struct frame *f, struct image *img)
       data = image_spec_value (img->spec, QCdata, NULL);
       if (!STRINGP (data))
         {
-          image_error ("Invalid image data `%s'", data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, data);
           return 0;
         }
       success_p = imagemagick_load_image (f, img, SDATA (data),
@@ -9092,7 +9104,7 @@ svg_load (struct frame *f, struct image *img)
       file = x_find_image_file (file_name);
       if (!STRINGP (file))
         {
-          image_error ("Cannot find image file `%s'", file_name, Qnil);
+          image_error ("Cannot find image file "uLSQM"%s"uRSQM, file_name);
           return 0;
         }
 
@@ -9100,7 +9112,7 @@ svg_load (struct frame *f, struct image *img)
       contents = slurp_file (SSDATA (file), &size);
       if (contents == NULL)
         {
-          image_error ("Error loading SVG image `%s'", img->spec, Qnil);
+          image_error ("Error loading SVG image "uLSQM"%s"uRSQM, img->spec);
           return 0;
         }
       /* If the file was slurped into memory properly, parse it.  */
@@ -9116,7 +9128,7 @@ svg_load (struct frame *f, struct image *img)
       data = image_spec_value (img->spec, QCdata, NULL);
       if (!STRINGP (data))
         {
-          image_error ("Invalid image data `%s'", data, Qnil);
+          image_error ("Invalid image data "uLSQM"%s"uRSQM, data);
           return 0;
         }
       original_filename = BVAR (current_buffer, filename);
@@ -9183,7 +9195,7 @@ svg_load_image (struct frame *f,         /* Pointer to emacs frame structure.  *
   rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
   if (! check_image_size (f, dimension_data.width, dimension_data.height))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       goto rsvg_error;
     }
 
@@ -9315,7 +9327,7 @@ svg_load_image (struct frame *f,         /* Pointer to emacs frame structure.  *
   g_object_unref (rsvg_handle);
   /* FIXME: Use error->message so the user knows what is the actual
      problem with the image.  */
-  image_error ("Error parsing SVG image `%s'", img->spec, Qnil);
+  image_error ("Error parsing SVG image "uLSQM"%s"uRSQM, img->spec);
   g_error_free (err);
   return 0;
 }
@@ -9468,7 +9480,7 @@ gs_load (struct frame *f, struct image *img)
   if (! (in_width <= INT_MAX && in_height <= INT_MAX
          && check_image_size (f, in_width, in_height)))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      image_error ("Invalid image size (see "uLSQM"max-image-size"uRSQM")");
       return 0;
     }
   img->width = in_width;
@@ -9489,7 +9501,7 @@ gs_load (struct frame *f, struct image *img)
 
   if (!img->pixmap)
     {
-      image_error ("Unable to create pixmap for `%s'", img->spec, Qnil);
+      image_error ("Unable to create pixmap for "uLSQM"%s"uRSQM, img->spec);
       return 0;
     }
 
@@ -9601,8 +9613,9 @@ x_kill_gs_process (Pixmap pixmap, struct frame *f)
 #endif
         }
       else
-        image_error ("Cannot get X image of `%s'; colors will not be freed",
-                     img->spec, Qnil);
+        image_error (("Cannot get X image of "uLSQM"%s"uRSQM";"
+                      " colors will not be freed"),
+                     img->spec);
 
       unblock_input ();
     }
diff --git a/src/keyboard.c b/src/keyboard.c
index 5f8667586c4..a577105a236 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -583,7 +583,7 @@ echo_now (void)
   if (!current_kboard->immediate_echo)
     {
       ptrdiff_t i;
-      current_kboard->immediate_echo = 1;
+      current_kboard->immediate_echo = true;
 
       for (i = 0; i < this_command_key_count; i++)
         {
@@ -611,10 +611,10 @@ echo_now (void)
       echo_dash ();
     }
 
-  echoing = 1;
+  echoing = true;
   /* FIXME: Use call (Qmessage) so it can be advised (e.g. emacspeak).  */
   message3_nolog (KVAR (current_kboard, echo_string));
-  echoing = 0;
+  echoing = false;
 
   /* Record in what buffer we echoed, and from which kboard.  */
   echo_message_buffer = echo_area_buffer[0];
@@ -629,7 +629,7 @@ echo_now (void)
 void
 cancel_echoing (void)
 {
-  current_kboard->immediate_echo = 0;
+  current_kboard->immediate_echo = false;
   current_kboard->echo_after_prompt = -1;
   kset_echo_string (current_kboard, Qnil);
   ok_to_echo_at_next_pause = NULL;
@@ -819,11 +819,11 @@ any_kboard_state ()
     {
       current_kboard->kbd_queue
         = nconc2 (Vunread_command_events, current_kboard->kbd_queue);
-      current_kboard->kbd_queue_has_data = 1;
+      current_kboard->kbd_queue_has_data = true;
     }
   Vunread_command_events = Qnil;
 #endif
-  single_kboard = 0;
+  single_kboard = false;
 }
 
 /* Switch to the single-kboard state, making current_kboard
@@ -832,7 +832,7 @@ any_kboard_state ()
 void
 single_kboard_state ()
 {
-  single_kboard = 1;
+  single_kboard = true;
 }
 #endif
 
@@ -843,7 +843,7 @@ void
 not_single_kboard_state (KBOARD *kboard)
 {
   if (kboard == current_kboard)
-    single_kboard = 0;
+    single_kboard = false;
 }
 
 /* Maintain a stack of kboards, so other parts of Emacs
@@ -875,13 +875,13 @@ pop_kboard (void)
 {
   struct terminal *t;
   struct kboard_stack *p = kboard_stack;
-  bool found = 0;
+  bool found = false;
   for (t = terminal_list; t; t = t->next_terminal)
     {
       if (t->kboard == p->kboard)
         {
           current_kboard = p->kboard;
-          found = 1;
+          found = true;
           break;
         }
     }
@@ -889,7 +889,7 @@ pop_kboard (void)
     {
       /* The terminal we remembered has been deleted.  */
       current_kboard = FRAME_KBOARD (SELECTED_FRAME ());
-      single_kboard = 0;
+      single_kboard = false;
     }
   kboard_stack = p->next;
   xfree (p);
@@ -929,7 +929,7 @@ temporarily_switch_to_single_kboard (struct frame *f)
     }
   else if (f != NULL)
     current_kboard = FRAME_KBOARD (f);
-  single_kboard = 1;
+  single_kboard = true;
   record_unwind_protect_int (restore_kboard_configuration, was_locked);
 }
 
@@ -1092,7 +1092,11 @@ command_loop (void)
   /* At least on GNU/Linux, saving signal mask is important here.  */
   if (sigsetjmp (return_to_command_loop, 1) != 0)
     {
-      /* Comes here from handle_sigsegv, see sysdep.c.  */
+      /* Comes here from handle_sigsegv (see sysdep.c) and
+         stack_overflow_handler (see w32fns.c).  */
+#ifdef WINDOWSNT
+      w32_reset_stack_overflow_guard ();
+#endif
       init_eval ();
       Vinternal__top_level_message = recover_top_level_message;
     }
@@ -1298,11 +1302,11 @@ command_loop_1 (void)
   kset_prefix_arg (current_kboard, Qnil);
   kset_last_prefix_arg (current_kboard, Qnil);
   Vdeactivate_mark = Qnil;
-  waiting_for_input = 0;
+  waiting_for_input = false;
   cancel_echoing ();
 
   this_command_key_count = 0;
-  this_command_key_count_reset = 0;
+  this_command_key_count_reset = false;
   this_single_command_key_start = 0;
 
   if (NILP (Vmemory_full))
@@ -1420,7 +1424,7 @@ command_loop_1 (void)
         {
           cancel_echoing ();
           this_command_key_count = 0;
-          this_command_key_count_reset = 0;
+          this_command_key_count_reset = false;
           this_single_command_key_start = 0;
           goto finalize;
         }
@@ -1562,7 +1566,7 @@ command_loop_1 (void)
             kset_last_repeatable_command (current_kboard, Vreal_this_command);
           cancel_echoing ();
           this_command_key_count = 0;
-          this_command_key_count_reset = 0;
+          this_command_key_count_reset = false;
           this_single_command_key_start = 0;
         }
 
@@ -1679,7 +1683,8 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
      suppress the point adjustment for automatic composition so that a
      user can keep inserting another character at point or keep
      deleting characters around point.  */
-  bool check_composition = ! modified, check_display = 1, check_invisible = 1;
+  bool check_composition = ! modified;
+  bool check_display = true, check_invisible = true;
   ptrdiff_t orig_pt = PT;
 
   eassert (XBUFFER (XWINDOW (selected_window)->contents) == current_buffer);
@@ -1694,9 +1699,9 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
           && (beg = composition_adjust_point (last_pt, PT)) != PT)
         {
           SET_PT (beg);
-          check_display = check_invisible = 1;
+          check_display = check_invisible = true;
         }
-      check_composition = 0;
+      check_composition = false;
       if (check_display
           && PT > BEGV && PT < ZV
           && !NILP (val = get_char_property_and_overlay
@@ -1716,13 +1721,13 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
                      ? max (beg - 1, BEGV)
                      : beg)
                   : end);
-          check_composition = check_invisible = 1;
+          check_composition = check_invisible = true;
         }
-      check_display = 0;
+      check_display = false;
       if (check_invisible && PT > BEGV && PT < ZV)
         {
           int inv;
-          bool ellipsis = 0;
+          bool ellipsis = false;
           beg = end = PT;
 
           /* Find boundaries `beg' and `end' of the invisible area, if any.  */
@@ -1788,7 +1793,7 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
                          was already in the range: we don't get to choose
                          which end of the range we have to go to.  */
                       : (PT < last_pt ? beg : end));
-              check_composition = check_display = 1;
+              check_composition = check_display = true;
             }
 #if 0 /* This assertion isn't correct, because SET_PT may end up setting
          the point to something other than its argument, due to
@@ -1801,9 +1806,9 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
           if (!modified && !ellipsis && beg < end)
             {
               if (last_pt == beg && PT == end && end < ZV)
-                (check_composition = check_display = 1, SET_PT (end + 1));
+                (check_composition = check_display = true, SET_PT (end + 1));
               else if (last_pt == end && PT == beg && beg > BEGV)
-                (check_composition = check_display = 1, SET_PT (beg - 1));
+                (check_composition = check_display = true, SET_PT (beg - 1));
               else if (PT == ((PT < last_pt) ? beg : end))
                 /* We've already moved as far as we can.  Trying to go
                    to the other end would mean moving backwards and thus
@@ -1816,11 +1821,11 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
                                   (make_number (PT == beg ? end : beg),
                                    Qinvisible, Qnil)),
                            !TEXT_PROP_MEANS_INVISIBLE (val)))
-                (check_composition = check_display = 1,
+                (check_composition = check_display = true,
                  SET_PT (PT == beg ? end : beg));
             }
         }
-      check_invisible = 0;
+      check_invisible = false;
     }
 }
 
@@ -1848,11 +1853,11 @@ safe_run_hooks_error (Lisp_Object error, ptrdiff_t nargs, Lisp_Object *args)
   if (SYMBOLP (hook))
     {
       Lisp_Object val;
-      bool found = 0;
+      bool found = false;
       Lisp_Object newval = Qnil;
       for (val = find_symbol_value (hook); CONSP (val); val = XCDR (val))
         if (EQ (fun, XCAR (val)))
-          found = 1;
+          found = true;
         else
           newval = Fcons (XCAR (val), newval);
       if (found)
@@ -1864,7 +1869,7 @@ safe_run_hooks_error (Lisp_Object error, ptrdiff_t nargs, Lisp_Object *args)
                   : Fdefault_value (hook));
            CONSP (val); val = XCDR (val))
         if (EQ (fun, XCAR (val)))
-          found = 1;
+          found = true;
         else
           newval = Fcons (XCAR (val), newval);
       if (found)
@@ -1929,7 +1934,7 @@ static void
 poll_for_input (struct atimer *timer)
 {
   if (poll_suppress_count == 0)
-    pending_signals = 1;
+    pending_signals = true;
 }
 
 #endif /* POLL_FOR_INPUT */
@@ -2133,7 +2138,7 @@ show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object,
       struct frame *f = NILP (do_mouse_tracking) ? NULL : some_mouse_moved ();
       help = call1 (Qmouse_fixup_help_message, help);
       if (f)
-        f->mouse_moved = 1;
+        f->mouse_moved = true;
     }
 
   if (STRINGP (help) || NILP (help))
@@ -2164,11 +2169,11 @@ read_char_help_form_unwind (void)
 
 #define STOP_POLLING                                    \
 do { if (! polling_stopped_here) stop_polling ();       \
-       polling_stopped_here = 1; } while (0)
+       polling_stopped_here = true; } while (0)
 
 #define RESUME_POLLING                                  \
 do { if (polling_stopped_here) start_polling ();        \
-       polling_stopped_here = 0; } while (0)
+       polling_stopped_here = false; } while (0)
 
 static Lisp_Object
 read_event_from_main_queue (struct timespec *end_time,
@@ -2209,7 +2214,7 @@ read_event_from_main_queue (struct timespec *end_time,
         kset_kbd_queue (kb, list1 (c));
       else
         XSETCDR (last, list1 (c));
-      kb->kbd_queue_has_data = 1;
+      kb->kbd_queue_has_data = true;
       c = Qnil;
       if (single_kboard)
         goto start;
@@ -2383,9 +2388,9 @@ read_char (int commandflag, Lisp_Object map,
   Lisp_Object tem, save;
   volatile Lisp_Object previous_echo_area_message;
   volatile Lisp_Object also_record;
-  volatile bool reread;
+  volatile bool reread, recorded;
   struct gcpro gcpro1, gcpro2;
-  bool volatile polling_stopped_here = 0;
+  bool volatile polling_stopped_here = false;
   struct kboard *orig_kboard = current_kboard;
 
   also_record = Qnil;
@@ -2401,6 +2406,8 @@ read_char (int commandflag, Lisp_Object map,
 
  retry:
 
+  recorded = false;
+
   if (CONSP (Vunread_post_input_method_events))
     {
       c = XCAR (Vunread_post_input_method_events);
@@ -2423,7 +2430,7 @@ read_char (int commandflag, Lisp_Object map,
 
   if (CONSP (Vunread_command_events))
     {
-      bool was_disabled = 0;
+      bool was_disabled = false;
 
       c = XCAR (Vunread_command_events);
       Vunread_command_events = XCDR (Vunread_command_events);
@@ -2442,7 +2449,7 @@ read_char (int commandflag, Lisp_Object map,
           && EQ (XCDR (c), Qdisabled)
           && (SYMBOLP (XCAR (c)) || INTEGERP (XCAR (c))))
         {
-          was_disabled = 1;
+          was_disabled = true;
           c = XCAR (c);
         }
 
@@ -2452,7 +2459,7 @@ read_char (int commandflag, Lisp_Object map,
           /* Also check was_disabled so last-nonmenu-event won't return
              a bad value when submenus are involved.  (Bug#447)  */
           && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar) || was_disabled))
-        *used_mouse_menu = 1;
+        *used_mouse_menu = true;
 
       goto reread_for_input_method;
     }
@@ -2472,7 +2479,7 @@ read_char (int commandflag, Lisp_Object map,
       goto reread_for_input_method;
     }
 
-  this_command_key_count_reset = 0;
+  this_command_key_count_reset = false;
 
   if (!NILP (Vexecuting_kbd_macro))
     {
@@ -2654,7 +2661,7 @@ read_char (int commandflag, Lisp_Object map,
               kset_kbd_queue (kb, list1 (c));
             else
               XSETCDR (last, list1 (c));
-            kb->kbd_queue_has_data = 1;
+            kb->kbd_queue_has_data = true;
             current_kboard = kb;
             /* This is going to exit from read_char
                so we had better get rid of this frame's stuff.  */
@@ -2830,7 +2837,7 @@ read_char (int commandflag, Lisp_Object map,
           kset_kbd_queue (current_kboard,
                           XCDR (KVAR (current_kboard, kbd_queue)));
           if (NILP (KVAR (current_kboard, kbd_queue)))
-            current_kboard->kbd_queue_has_data = 0;
+            current_kboard->kbd_queue_has_data = false;
           input_pending = readable_events (0);
           if (EVENT_HAS_PARAMETERS (c)
               && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qswitch_frame))
@@ -2990,6 +2997,7 @@ read_char (int commandflag, Lisp_Object map,
   /* Store these characters into recent_keys, the dribble file if any,
      and the keyboard macro being defined, if any.  */
   record_char (c);
+  recorded = true;
   if (! NILP (also_record))
     record_char (also_record);
 
@@ -3067,7 +3075,7 @@ read_char (int commandflag, Lisp_Object map,
 
       /* Clear out this_command_keys.  */
       this_command_key_count = 0;
-      this_command_key_count_reset = 0;
+      this_command_key_count_reset = false;
       this_single_command_key_start = 0;
 
       /* Now wipe the echo area.  */
@@ -3125,6 +3133,14 @@ read_char (int commandflag, Lisp_Object map,
       Vunread_post_input_method_events
         = nconc2 (XCDR (tem), Vunread_post_input_method_events);
     }
+  /* When we consume events from the various unread-*-events lists, we
+     bypass the code that records input, so record these events now if
+     they were not recorded already.  */
+  if (!recorded)
+    {
+      record_char (c);
+      recorded = true;
+    }
 
  reread_first:
 
@@ -3575,7 +3591,7 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event,
               kset_kbd_queue
                 (kb, list2 (make_lispy_switch_frame (event->ie.frame_or_window),
                             make_number (c)));
-              kb->kbd_queue_has_data = 1;
+              kb->kbd_queue_has_data = true;
               union buffered_input_event *sp;
               for (sp = kbd_fetch_ptr; sp != kbd_store_ptr; sp++)
                 {
@@ -3669,7 +3685,7 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event,
          do it now.  */
       if (immediate_quit && NILP (Vinhibit_quit))
         {
-          immediate_quit = 0;
+          immediate_quit = false;
           QUIT;
         }
     }
@@ -3987,7 +4003,7 @@ kbd_buffer_get_event (KBOARD **kbp,
             obj = list1 (intern ("ns-unput-working-text"));
           kbd_fetch_ptr = event + 1;
           if (used_mouse_menu)
-            *used_mouse_menu = 1;
+            *used_mouse_menu = true;
         }
 #endif
 
@@ -4182,13 +4198,13 @@ kbd_buffer_get_event (KBOARD **kbp,
                   && !EQ (event->ie.frame_or_window, event->ie.arg)
                   && (event->kind == MENU_BAR_EVENT
                       || event->kind == TOOL_BAR_EVENT))
-                *used_mouse_menu = 1;
+                *used_mouse_menu = true;
 #endif
 #ifdef HAVE_NS
               /* Certain system events are non-key events.  */
               if (used_mouse_menu
                   && event->kind == NS_NONKEY_EVENT)
-                *used_mouse_menu = 1;
+                *used_mouse_menu = true;
 #endif
 
               /* Wipe out this event, to catch bugs.  */
@@ -6226,6 +6242,10 @@ parse_modifiers_uncached (Lisp_Object symbol, ptrdiff_t *modifier_end)
         case 't':
           MULTI_LETTER_MOD (triple_modifier, "triple", 6);
           break;
+
+        case 'u':
+          MULTI_LETTER_MOD (up_modifier, "up", 2);
+          break;
 #undef MULTI_LETTER_MOD
 
         }
@@ -6273,16 +6293,19 @@ apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_
   /* Since BASE could contain nulls, we can't use intern here; we have
      to use Fintern, which expects a genuine Lisp_String, and keeps a
      reference to it.  */
-  char new_mods[sizeof "A-C-H-M-S-s-down-drag-double-triple-"];
+  char new_mods[sizeof "A-C-H-M-S-s-up-down-drag-double-triple-"];
   int mod_len;
 
   {
     char *p = new_mods;
 
-    /* Only the event queue may use the `up' modifier; it should always
-       be turned into a click or drag event before presented to lisp code.  */
-    if (modifiers & up_modifier)
-      emacs_abort ();
+    /* Mouse events should not exhibit the `up' modifier once they
+       leave the event queue only accessible to C code; `up' will
+       always be turned into a click or drag event before being
+       presented to lisp code.  But since lisp events can be
+       synthesized bypassing the event queue and pushed into
+       `unread-command-events' or its companions, it's better to just
+       deal with unexpected modifier combinations. */
 
     if (modifiers & alt_modifier)   { *p++ = 'A'; *p++ = '-'; }
     if (modifiers & ctrl_modifier)  { *p++ = 'C'; *p++ = '-'; }
@@ -6292,6 +6315,7 @@ apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_
     if (modifiers & super_modifier) { *p++ = 's'; *p++ = '-'; }
     if (modifiers & double_modifier) p = stpcpy (p, "double-");
     if (modifiers & triple_modifier) p = stpcpy (p, "triple-");
+    if (modifiers & up_modifier) p = stpcpy (p, "up-");
     if (modifiers & down_modifier) p = stpcpy (p, "down-");
     if (modifiers & drag_modifier) p = stpcpy (p, "drag-");
     /* The click modifier is denoted by the absence of other modifiers.  */
@@ -6411,8 +6435,7 @@ DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,
    BASE must be unmodified.
 
    This is like apply_modifiers_uncached, but uses BASE's
-   Qmodifier_cache property, if present.  It also builds
-   Qevent_symbol_elements properties, since it has that info anyway.
+   Qmodifier_cache property, if present.
 
    apply_modifiers copies the value of BASE's Qevent_kind property to
    the modified symbol.  */
@@ -6758,6 +6781,10 @@ parse_solitary_modifier (Lisp_Object symbol)
       MULTI_LETTER_MOD (triple_modifier, "triple", 6);
       break;
 
+    case 'u':
+      MULTI_LETTER_MOD (up_modifier, "up", 2);
+      break;
+
 #undef SINGLE_LETTER_MOD
 #undef MULTI_LETTER_MOD
     }
@@ -6870,7 +6897,7 @@ int
 gobble_input (void)
 {
   int nread = 0;
-  bool err = 0;
+  bool err = false;
   struct terminal *t;
 
   /* Store pending user signal events, if any.  */
@@ -6889,7 +6916,7 @@ gobble_input (void)
 
           if (input_blocked_p ())
             {
-              pending_signals = 1;
+              pending_signals = true;
               break;
             }
 
@@ -6902,7 +6929,7 @@ gobble_input (void)
 
           if (nr == -1)          /* Not OK to read input now.  */
             {
-              err = 1;
+              err = true;
             }
           else if (nr == -2)          /* Non-transient error.  */
             {
@@ -7162,7 +7189,7 @@ handle_async_input (void)
 void
 process_pending_signals (void)
 {
-  pending_signals = 0;
+  pending_signals = false;
   handle_async_input ();
   do_pending_atimers ();
 }
@@ -7214,7 +7241,7 @@ totally_unblock_input (void)
 void
 handle_input_available_signal (int sig)
 {
-  pending_signals = 1;
+  pending_signals = true;
 
   if (input_available_clear_time)
     *input_available_clear_time = make_timespec (0, 0);
@@ -7285,8 +7312,8 @@ handle_user_signal (int sig)
             && strcmp (special_event_name, p->name) == 0)
           {
             /* Enter the debugger in many ways.  */
-            debug_on_next_call = 1;
-            debug_on_quit = 1;
+            debug_on_next_call = true;
+            debug_on_quit = true;
             Vquit_flag = Qt;
             Vinhibit_quit = Qnil;
 
@@ -7333,7 +7360,7 @@ store_user_signal_events (void)
 {
   struct user_signal_info *p;
   struct input_event buf;
-  bool buf_initialized = 0;
+  bool buf_initialized = false;
 
   for (p = user_signals; p; p = p->next)
     if (p->npending > 0)
@@ -7343,7 +7370,7 @@ store_user_signal_events (void)
             memset (&buf, 0, sizeof buf);
             buf.kind = USER_SIGNAL_EVENT;
             buf.frame_or_window = selected_frame;
-            buf_initialized = 1;
+            buf_initialized = true;
           }
 
         do
@@ -8175,7 +8202,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
   Lisp_Object filter = Qnil;
   Lisp_Object caption;
   int i;
-  bool have_label = 0;
+  bool have_label = false;
 
   /* Definition looks like `(menu-item CAPTION BINDING PROPS...)'.
      Rule out items that aren't lists, don't start with
@@ -8284,7 +8311,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
           /* `:label LABEL-STRING'.  */
           set_prop (TOOL_BAR_ITEM_LABEL,
                     STRINGP (value) ? value : build_string (bad_label));
-          have_label = 1;
+          have_label = true;
         }
       else if (EQ (ikey, QCfilter))
         /* ':filter FORM'.  */
@@ -8450,7 +8477,7 @@ read_char_x_menu_prompt (Lisp_Object map,
                          Lisp_Object prev_event, bool *used_mouse_menu)
 {
   if (used_mouse_menu)
-    *used_mouse_menu = 0;
+    *used_mouse_menu = false;
 
   /* Use local over global Menu maps.  */
 
@@ -8499,7 +8526,7 @@ read_char_x_menu_prompt (Lisp_Object map,
       else if (NILP (value))
         value = Qt;
       if (used_mouse_menu)
-        *used_mouse_menu = 1;
+        *used_mouse_menu = true;
       return value;
     }
   return Qnil ;
@@ -8514,7 +8541,7 @@ read_char_minibuf_menu_prompt (int commandflag,
   /* FIXME: Use the minibuffer's frame width.  */
   ptrdiff_t width = FRAME_COLS (SELECTED_FRAME ()) - 4;
   ptrdiff_t idx = -1;
-  bool nobindings = 1;
+  bool nobindings = true;
   Lisp_Object rest, vector;
   Lisp_Object prompt_strings = Qnil;
 
@@ -8543,7 +8570,7 @@ read_char_minibuf_menu_prompt (int commandflag,
   /* Present the documented bindings, a line at a time.  */
   while (1)
     {
-      bool notfirst = 0;
+      bool notfirst = false;
       Lisp_Object menu_strings = prompt_strings;
       ptrdiff_t i = nlength;
       Lisp_Object obj;
@@ -8654,8 +8681,8 @@ read_char_minibuf_menu_prompt (int commandflag,
                           PUSH_C_STR (", ", menu_strings);
                           i += 2;
                         }
-                      notfirst = 1;
-                      nobindings = 0;
+                      notfirst = true;
+                      nobindings = false;
 
                       /* If the char to type doesn't match the string's
                          first char, explicitly show what char to type.  */
@@ -8971,7 +8998,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
   /* True if we are trying to map a key by changing an upper-case
      letter to lower case, or a shifted function key to an unshifted
      one.  */
-  bool shift_translated = 0;
+  bool shift_translated = false;
 
   /* If we receive a `switch-frame' or `select-window' event in the middle of
      a key sequence, we put it off for later.
@@ -8982,7 +9009,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
   int original_uppercase_position = -1;
 
   /* Gets around Microsoft compiler limitations.  */
-  bool dummyflag = 0;
+  bool dummyflag = false;
 
   struct buffer *starting_buffer;
 
@@ -9072,7 +9099,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
          : (/* indec.start < t || fkey.start < t || */ keytran.start < t))
     {
       Lisp_Object key;
-      bool used_mouse_menu = 0;
+      bool used_mouse_menu = false;
 
       /* Where the last real key started.  If we need to throw away a
          key that has expanded into more than one element of keybuf
@@ -9169,12 +9196,12 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
                    return.  Any better way to fix this? -- cyd  */
                 || (interrupted_kboard != current_kboard))
               {
-                bool found = 0;
+                bool found = false;
                 struct kboard *k;
 
                 for (k = all_kboards; k; k = k->next_kboard)
                   if (k == interrupted_kboard)
-                    found = 1;
+                    found = true;
 
                 if (!found)
                   {
@@ -9235,7 +9262,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
               t = 0;
               /* The Microsoft C compiler can't handle the goto that
                  would go here.  */
-              dummyflag = 1;
+              dummyflag = true;
               break;
             }
 
@@ -9471,14 +9498,16 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
                    Drags reduce to clicks.
                    Double-clicks reduce to clicks.
                    Triple-clicks reduce to double-clicks, then to clicks.
-                   Down-clicks are eliminated.
+                   Up/Down-clicks are eliminated.
                    Double-downs reduce to downs, then are eliminated.
                    Triple-downs reduce to double-downs, then to downs,
                      then are eliminated.  */
-              if (modifiers & (down_modifier | drag_modifier
+              if (modifiers & (up_modifier | down_modifier
+                               | drag_modifier
                                | double_modifier | triple_modifier))
                 {
-                  while (modifiers & (down_modifier | drag_modifier
+                  while (modifiers & (up_modifier | down_modifier
+                                      | drag_modifier
                                       | double_modifier | triple_modifier))
                     {
                       Lisp_Object new_head, new_click;
@@ -9490,7 +9519,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
                         modifiers &= ~drag_modifier;
                       else
                         {
-                          /* Dispose of this `down' event by simply jumping
+                          /* Dispose of this `up/down' event by simply jumping
                              back to replay_key, to get another event.
 
                              Note that if this event came from mock input,
@@ -9723,7 +9752,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
              might get translated through function-key-map.  */
           keybuf[t - 1] = new_key;
           mock_input = max (t, mock_input);
-          shift_translated = 1;
+          shift_translated = true;
 
           goto replay_sequence;
         }
@@ -9734,7 +9763,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
               read_key_sequence_cmd = Vprefix_help_command;
               /* The Microsoft C compiler can't handle the goto that
                  would go here.  */
-              dummyflag = 1;
+              dummyflag = true;
               break;
             }
 
@@ -9776,7 +9805,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
                  input-decode-map doesn't need to go through it again.  */
               fkey.start = fkey.end = 0;
               keytran.start = keytran.end = 0;
-              shift_translated = 1;
+              shift_translated = true;
 
               goto replay_sequence;
             }
@@ -9802,7 +9831,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
       && t - 1 == original_uppercase_position)
     {
       keybuf[t - 1] = original_uppercase;
-      shift_translated = 0;
+      shift_translated = false;
     }
 
   if (shift_translated)
@@ -9855,7 +9884,7 @@ read_key_sequence_vs (Lisp_Object prompt, Lisp_Object continue_echo,
   if (NILP (continue_echo))
     {
       this_command_key_count = 0;
-      this_command_key_count_reset = 0;
+      this_command_key_count_reset = false;
       this_single_command_key_start = 0;
     }
 
@@ -9990,7 +10019,7 @@ detect_input_pending_run_timers (bool do_display)
 void
 clear_input_pending (void)
 {
-  input_pending = 0;
+  input_pending = false;
 }
 
 /* Return true if there are pending requeued events.
@@ -10134,7 +10163,7 @@ these events the first time.  */)
 
   /* Cause whatever we put into unread-command-events
      to echo as if it were being freshly read from the keyboard.  */
-  this_command_key_count_reset = 1;
+  this_command_key_count_reset = true;
 
   return Qnil;
 }
@@ -10149,7 +10178,7 @@ KEEP-RECORD is non-nil.  */)
   int i;
 
   this_command_key_count = 0;
-  this_command_key_count_reset = 0;
+  this_command_key_count_reset = false;
 
   if (NILP (keep_record))
     {
@@ -10223,7 +10252,7 @@ Also end any kbd macro being defined.  */)
   discard_tty_input ();
 
   kbd_fetch_ptr =  kbd_store_ptr;
-  input_pending = 0;
+  input_pending = false;
 
   return Qnil;
 }
@@ -10321,7 +10350,7 @@ stuff_buffered_input (Lisp_Object stuffstring)
       clear_event (kbd_fetch_ptr);
     }
 
-  input_pending = 0;
+  input_pending = false;
 #endif /* SIGTSTP */
 }
 
@@ -10331,7 +10360,7 @@ set_waiting_for_input (struct timespec *time_to_clear)
   input_available_clear_time = time_to_clear;
 
   /* Tell handle_interrupt to throw back to read_char,  */
-  waiting_for_input = 1;
+  waiting_for_input = true;
 
   /* If handle_interrupt was called before and buffered a C-g,
      make it run again now, to avoid timing error.  */
@@ -10343,7 +10372,7 @@ void
 clear_waiting_for_input (void)
 {
   /* Tell handle_interrupt not to throw back to read_char,  */
-  waiting_for_input = 0;
+  waiting_for_input = false;
   input_available_clear_time = 0;
 }
 
@@ -10504,7 +10533,7 @@ handle_interrupt (bool in_signal_handler)
           struct gl_state_s saved;
           struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 
-          immediate_quit = 0;
+          immediate_quit = false;
           pthread_sigmask (SIG_SETMASK, &empty_mask, 0);
           saved = gl_state;
           GCPRO4 (saved.object, saved.global_code,
@@ -10519,7 +10548,7 @@ handle_interrupt (bool in_signal_handler)
           force_quit_count = count;
           if (count == 3)
             {
-              immediate_quit = 1;
+              immediate_quit = true;
               Vinhibit_quit = Qnil;
             }
           Vquit_flag = Qt;
@@ -10553,7 +10582,7 @@ quit_throw_to_read_char (bool from_signal)
 
   /* Prevent another signal from doing this before we finish.  */
   clear_waiting_for_input ();
-  input_pending = 0;
+  input_pending = false;
 
   Vunread_command_events = Qnil;
 
@@ -10581,13 +10610,13 @@ See also `current-input-mode'.  */)
     {
       /* When using X, don't give the user a real choice,
          because we haven't implemented the mechanisms to support it.  */
-      new_interrupt_input = 1;
+      new_interrupt_input = true;
     }
   else
 #endif /* HAVE_X_WINDOWS */
     new_interrupt_input = !NILP (interrupt);
 #else /* not USABLE_SIGIO */
-  new_interrupt_input = 0;
+  new_interrupt_input = false;
 #endif /* not USABLE_SIGIO */
 
   if (new_interrupt_input != interrupt_input)
@@ -10879,8 +10908,8 @@ init_kboard (KBOARD *kb, Lisp_Object type)
   kset_prefix_arg (kb, Qnil);
   kset_last_prefix_arg (kb, Qnil);
   kset_kbd_queue (kb, Qnil);
-  kb->kbd_queue_has_data = 0;
-  kb->immediate_echo = 0;
+  kb->kbd_queue_has_data = false;
+  kb->immediate_echo = false;
   kset_echo_string (kb, Qnil);
   kb->echo_after_prompt = -1;
   kb->kbd_macro_buffer = 0;
@@ -10940,7 +10969,7 @@ delete_kboard (KBOARD *kb)
       && FRAME_LIVE_P (XFRAME (selected_frame)))
     {
       current_kboard = FRAME_KBOARD (XFRAME (selected_frame));
-      single_kboard = 0;
+      single_kboard = false;
       if (current_kboard == kb)
         emacs_abort ();
     }
@@ -10954,7 +10983,7 @@ init_keyboard (void)
 {
   /* This is correct before outermost invocation of the editor loop.  */
   command_loop_level = -1;
-  immediate_quit = 0;
+  immediate_quit = false;
   quit_char = Ctl ('g');
   Vunread_command_events = Qnil;
   timer_idleness_start_time = invalid_timespec ();
@@ -10963,9 +10992,9 @@ init_keyboard (void)
   kbd_fetch_ptr = kbd_buffer;
   kbd_store_ptr = kbd_buffer;
   do_mouse_tracking = Qnil;
-  input_pending = 0;
+  input_pending = false;
   interrupt_input_blocked = 0;
-  pending_signals = 0;
+  pending_signals = false;
 
   /* This means that command_loop_1 won't try to select anything the first
      time through.  */
@@ -11517,7 +11546,7 @@ See Info node `(elisp)Multiple Terminals'.  */);
   DEFVAR_BOOL ("cannot-suspend", cannot_suspend,
                doc: /* Non-nil means to always spawn a subshell instead of suspending.
 \(Even if the operating system has support for stopping a process.\)  */);
-  cannot_suspend = 0;
+  cannot_suspend = false;
 
   DEFVAR_BOOL ("menu-prompting", menu_prompting,
                doc: /* Non-nil means prompt with menus when appropriate.
@@ -11527,7 +11556,7 @@ The menu is displayed on the screen
 if X menus were enabled at configuration
 time and the previous event was a mouse click prefix key.
 Otherwise, menu prompting uses the echo area.  */);
-  menu_prompting = 1;
+  menu_prompting = true;
 
   DEFVAR_LISP ("menu-prompt-more-char", menu_prompt_more_char,
                doc: /* Character to see next line of menu prompt.
diff --git a/src/keyboard.h b/src/keyboard.h
index b843e8db903..3e4c475d285 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -170,7 +170,7 @@ struct kboard
        kbd_queue_has_data is 0.  When we push back an incomplete
        command, then this flag is 0, meaning we don't want to try
        reading from this KBOARD again until more input arrives.  */
-    char kbd_queue_has_data;
+    bool_bf kbd_queue_has_data;
 
     /* True means echo each character as typed.  */
     bool_bf immediate_echo : 1;
diff --git a/src/lisp.h b/src/lisp.h
index 02109d72174..d3dcaecd2bb 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3667,7 +3667,8 @@ extern Lisp_Object sit_for (Lisp_Object, bool, int);
 /* Defined in xdisp.c.  */
 extern bool noninteractive_need_newline;
 extern Lisp_Object echo_area_buffer[2];
-extern void add_to_log (const char *, Lisp_Object, Lisp_Object);
+extern void add_to_log (char const *, ...);
+extern void vadd_to_log (char const *, va_list);
 extern void check_message_stack (void);
 extern void setup_echo_area_for_printing (bool);
 extern bool push_message (void);
@@ -4299,6 +4300,25 @@ extern void set_initial_environment (void);
 extern void syms_of_callproc (void);
 
 /* Defined in doc.c.  */
+enum
+  {
+    /* Named constants for the UTF-8 encodings of U+2018 LEFT SINGLE
+       QUOTATION MARK and U+2019 RIGHT SINGLE QUOTATION MARK.  */
+    uLSQM0 = 0xE2, uLSQM1 = 0x80, uLSQM2 = 0x98,
+    uRSQM0 = 0xE2, uRSQM1 = 0x80, uRSQM2 = 0x99
+  };
+enum text_quoting_style
+  {
+    /* Use curved single quotes ‘like this’.  */
+    CURVE_QUOTING_STYLE,
+
+    /* Use grave accent and apostrophe  `like this'.  */
+    GRAVE_QUOTING_STYLE,
+
+    /* Use apostrophes 'like this'.  */
+    STRAIGHT_QUOTING_STYLE
+  };
+extern enum text_quoting_style text_quoting_style (void);
 extern Lisp_Object read_doc_string (Lisp_Object);
 extern Lisp_Object get_doc_string (Lisp_Object, bool, bool);
 extern void syms_of_doc (void);
diff --git a/src/lread.c b/src/lread.c
index 11c8d0031c9..ebd594c1a16 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -947,7 +947,8 @@ load_warn_old_style_backquotes (Lisp_Object file)
 {
   if (!NILP (Vold_style_backquotes))
     {
-      AUTO_STRING (format, "Loading `%s': old-style backquotes detected!");
+      Lisp_Object format = build_string ("Loading "uLSQM"%s"uRSQM
+                                         ": old-style backquotes detected!");
       CALLN (Fmessage, format, file);
     }
 }
@@ -1885,7 +1886,7 @@ readevalloop (Lisp_Object readcharfun,
 
       /* Ignore whitespace here, so we can detect eof.  */
       if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r'
-          || c == 0xa0)  /* NBSP */
+          || c == NO_BREAK_SPACE)
         goto read_next;
 
       if (!NILP (Vpurify_flag) && c == '(')
@@ -2793,7 +2794,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
           uninterned_symbol = 1;
           c = READCHAR;
           if (!(c > 040
-                && c != 0xa0    /* NBSP */
+                && c != NO_BREAK_SPACE
                 && (c >= 0200
                     || strchr ("\"';()[]#`,", c) == NULL)))
             {
@@ -3127,7 +3128,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
     default:
     default_label:
       if (c <= 040) goto retry;
-      if (c == 0xa0) /* NBSP */
+      if (c == NO_BREAK_SPACE)
         goto retry;
 
     read_symbol:
@@ -3167,7 +3168,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
               c = READCHAR;
             }
           while (c > 040
-                 && c != 0xa0 /* NBSP */
+                 && c != NO_BREAK_SPACE
                  && (c >= 0200
                      || strchr ("\"';()[]#`,", c) == NULL));
 
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
deleted file mode 100644
index 795b55a7c43..00000000000
--- a/src/makefile.w32-in
+++ /dev/null
@@ -1,1725 +0,0 @@
-# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
-
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-ALL = emacs
-
-.PHONY: $(ALL)
-
-# Set EMACSLOADPATH correctly (in case already defined in environment).
-EMACSLOADPATH=$(CURDIR)/../lisp
-
-# Size in MBs of the static heap in temacs.exe.
-HEAPSIZE = $(EMACS_HEAPSIZE)
-
-LOCAL_FLAGS     = -Demacs=1 -I../lib -I../nt/inc $(EMACS_EXTRA_C_FLAGS)
-
-SRC             = .
-EMACS           = $(BLD)/emacs.exe
-TEMACS          = $(BLD)/temacs.exe
-TEMACS_TMP      = $(BLD)/temacs.bin
-TLIB0           = $(BLD)/temacs0.$(A)
-TLIB1           = $(BLD)/temacs1.$(A)
-TLIB2           = $(BLD)/temacs2.$(A)
-TOBJ            = $(BLD)/firstfile.$(O)
-TRES            = $(BLD)/emacs.res
-TLASTLIB        = $(BLD)/lastfile.$(A)
-GNULIB          = ../lib/$(BLD)/libgnu.$(A)
-
-DOC             = $(OBJDIR)/etc/DOC
-
-FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
-
-#
-# Split up the objects into two sets so that we don't run out of
-# command line space when we link them into a library.
-#
-# Put emacs.$(O) in a separate lib, since we need to have firstfile.$(O)
-# as the "main" object file when linking.
-#
-OBJ0 =  $(BLD)/emacs.$(O)
-
-OBJ1 =  $(BLD)/alloc.$(O)               \
-        $(BLD)/atimer.$(O)              \
-        $(BLD)/buffer.$(O)              \
-        $(BLD)/bytecode.$(O)            \
-        $(BLD)/callint.$(O)             \
-        $(BLD)/callproc.$(O)            \
-        $(BLD)/casefiddle.$(O)          \
-        $(BLD)/cmds.$(O)                \
-        $(BLD)/data.$(O)                \
-        $(BLD)/dired.$(O)               \
-        $(BLD)/dispnew.$(O)             \
-        $(BLD)/doc.$(O)                 \
-        $(BLD)/doprnt.$(O)              \
-        $(BLD)/editfns.$(O)             \
-        $(BLD)/eval.$(O)                \
-        $(BLD)/fileio.$(O)              \
-        $(BLD)/filelock.$(O)            \
-        $(BLD)/fns.$(O)                 \
-        $(BLD)/indent.$(O)              \
-        $(BLD)/insdel.$(O)              \
-        $(BLD)/keyboard.$(O)            \
-        $(BLD)/keymap.$(O)              \
-        $(BLD)/lread.$(O)               \
-        $(BLD)/macros.$(O)              \
-        $(BLD)/marker.$(O)              \
-        $(BLD)/minibuf.$(O)             \
-        $(BLD)/w32.$(O)                 \
-        $(BLD)/w32heap.$(O)             \
-        $(BLD)/w32inevt.$(O)            \
-        $(BLD)/w32proc.$(O)             \
-        $(BLD)/w32console.$(O)          \
-        $(BLD)/print.$(O)               \
-        $(BLD)/process.$(O)             \
-        $(BLD)/regex.$(O)               \
-        $(BLD)/scroll.$(O)              \
-        $(BLD)/search.$(O)              \
-        $(BLD)/sound.$(O)               \
-        $(BLD)/syntax.$(O)
-
-OBJ2 =  $(BLD)/sysdep.$(O)              \
-        $(BLD)/term.$(O)                \
-        $(BLD)/tparam.$(O)              \
-        $(BLD)/undo.$(O)                \
-        $(BLD)/unexw32.$(O)             \
-        $(BLD)/window.$(O)              \
-        $(BLD)/xdisp.$(O)               \
-        $(BLD)/casetab.$(O)             \
-        $(BLD)/floatfns.$(O)            \
-        $(BLD)/frame.$(O)               \
-        $(BLD)/gmalloc.$(O)             \
-        $(BLD)/gnutls.$(O)              \
-        $(BLD)/intervals.$(O)           \
-        $(BLD)/composite.$(O)           \
-        $(BLD)/ralloc.$(O)              \
-        $(BLD)/textprop.$(O)            \
-        $(BLD)/vm-limit.$(O)            \
-        $(BLD)/region-cache.$(O)        \
-        $(BLD)/bidi.$(O)                \
-        $(BLD)/charset.$(O)             \
-        $(BLD)/character.$(O)           \
-        $(BLD)/chartab.$(O)             \
-        $(BLD)/coding.$(O)              \
-        $(BLD)/category.$(O)            \
-        $(BLD)/ccl.$(O)                 \
-        $(BLD)/font.$(O)                \
-        $(BLD)/fontset.$(O)             \
-        $(BLD)/fringe.$(O)              \
-        $(BLD)/image.$(O)               \
-        $(BLD)/terminal.$(O)            \
-        $(BLD)/menu.$(O)                \
-        $(BLD)/xml.$(O)                 \
-        $(BLD)/profiler.$(O)            \
-        $(BLD)/w32term.$(O)             \
-        $(BLD)/w32xfns.$(O)             \
-        $(BLD)/w32fns.$(O)              \
-        $(BLD)/xfaces.$(O)              \
-        $(BLD)/w32select.$(O)           \
-        $(BLD)/w32menu.$(O)             \
-        $(BLD)/w32reg.$(O)              \
-        $(BLD)/w32font.$(O)             \
-        $(BLD)/w32notify.$(O)           \
-        $(BLD)/w32uniscribe.$(O)
-
-LIBS =  $(TLIB0)        \
-        $(TLIB1)        \
-        $(TLIB2)        \
-        $(TLASTLIB)     \
-        $(GNULIB)       \
-        $(WINMM)        \
-        $(ADVAPI32)     \
-        $(GDI32)        \
-        $(COMDLG32)     \
-        $(USER32)       \
-        $(MPR)          \
-        $(SHELL32)      \
-        $(WINSPOOL)     \
-        $(OLE32)        \
-        $(COMCTL32)     \
-        $(UNISCRIBE)    \
-        $(USER_LIBS)    \
-        $(libc)
-
-#
-# Build the executable and dump it.
-#
-all:            $(ALL)
-
-#
-# The dumped executable
-#
-emacs:          stamp_BLD $(EMACS)
-$(EMACS):       $(DOC) $(TEMACS)
-        "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump
-        -"$(THISDIR)/$(BLD)/emacs.exe" -batch -f list-load-path-shadows
-
-#
-# The undumped executable
-# Note the extra post-link step to insert a static preload heap section.
-# If preload runs out of memory, increase the last argument to addsection
-# (it is the preload heap size in MB).
-#
-temacs:         stamp_BLD $(TEMACS)
-$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
-                  ../nt/$(BLD)/addsection.exe $(GNULIB)
-        $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-        "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE)
-
-# These omit firstfile.${O}, but there's no documentation in there
-# anyways.
-buildobj.h: $(SRC)/makefile.w32-in
-        $(MAKE) $(MFLAGS) make-buildobj-$(SHELLTYPE)
-
-# Cannot have blanks between the backslash and the redirection
-# characters, because CMD's `echo' will put them in buildobj.h.
-make-buildobj-CMD:
-        echo #define BUILDOBJ ^"\> buildobj.h
-        echo $(OBJ0)            \>> buildobj.h
-        echo $(OBJ1)            \>> buildobj.h
-        echo $(OBJ2)            \>> buildobj.h
-        echo ^">> buildobj.h
-
-# "
-# The above line is here to countermand the single quote
-# on the last "echo" command above, wrt font-lock.
-make-buildobj-SH:
-        echo '#define BUILDOBJ $(DQUOTE)\'  > buildobj.h
-        echo $(OBJ0)                   '\' >> buildobj.h
-        echo $(OBJ1)                   '\' >> buildobj.h
-        echo $(OBJ2)                   '\' >> buildobj.h
-        echo '$(DQUOTE)'                   >> buildobj.h
-
-GLOBAL_SOURCES =   dosfns.c msdos.c \
-        xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
-        fontset.c menu.c dbusbind.c \
-        w32.c w32console.c w32fns.c w32heap.c w32inevt.c cygw32.c \
-        w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
-        font.c w32font.c w32uniscribe.c w32notify.c \
-        dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
-        charset.c coding.c category.c ccl.c character.c chartab.c \
-        cm.c term.c terminal.c xfaces.c \
-        emacs.c keyboard.c macros.c keymap.c sysdep.c \
-        buffer.c filelock.c insdel.c marker.c \
-        minibuf.c fileio.c dired.c \
-        cmds.c casetab.c casefiddle.c indent.c search.c regex.c undo.c \
-        alloc.c data.c doc.c editfns.c callint.c \
-        eval.c floatfns.c fns.c print.c lread.c \
-        syntax.c bytecode.c \
-        process.c callproc.c unexw32.c \
-        region-cache.c sound.c atimer.c \
-        doprnt.c intervals.c textprop.c composite.c \
-        gnutls.c xml.c profiler.c
-SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
-        xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
-obj = $(GLOBAL_SOURCES:.c=.o)
-
-globals.h: gl-stamp
-        @cmd $(SWITCHCHAR)c rem true
-
-gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
-        - $(DEL) gl-tmp
-        "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
-        fc.exe $(SWITCHCHAR)b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h
-        - $(DEL) gl-tmp
-        echo timestamp > $@
-
-bootstrap: bootstrap-emacs
-
-#
-# Build a temacs with a sufficiently large PURESIZE to load the
-# Lisp files from loadup.el in source form.
-#
-# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
-#          this can break with GNU Make 3.81 and later if sh.exe is used.
-bootstrap-temacs-CMD:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(ESC_CFLAGS) -DPURESIZE=$(EMACS_PURESIZE)$(ARGQUOTE)
-
-bootstrap-temacs-SH:
-        $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=$(EMACS_PURESIZE)$(ARGQUOTE)
-
-bootstrap-temacs:
-        $(MAKE) $(MFLAGS) bootstrap-temacs-$(SHELLTYPE)
-
-#
-# Dump an Emacs executable named bootstrap-emacs containing the
-# files from loadup.el in source form.
-#
-bootstrap-emacs: bootstrap-temacs
-        "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup bootstrap
-        - mkdir "../bin"
-        $(CP) $(EMACS) ../bin
-
-#
-# Force recompile of files that depend on PURESIZE
-#
-bootstrap-clean:
-        - $(DEL) $(BLD)/alloc.$(O)
-        - $(DEL) $(BLD)/data.$(O)
-        - $(DEL) $(BLD)/intervals.$(O)
-        - $(DEL) $(BLD)/keyboard.$(O)
-        - $(DEL) $(BLD)/keymap.$(O)
-
-#
-# The resource file.  NT 3.10 requires the use of cvtres; even though
-# it is not necessary on later versions, it is still ok to use it.
-#
-$(TRES): ../nt/emacs.rc stamp_BLD
-        $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ ../nt/emacs.rc
-
-#
-# Build the library.  Split up the build into two phases...otherwise we
-# run out of command line space.
-#
-$(TLIB0):       $(OBJ0)
-        - $(DEL) $@
-        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
-$(TLIB1):       $(OBJ1)
-        - $(DEL) $@
-        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
-$(TLIB2):       $(OBJ2)
-        - $(DEL) $@
-        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
-
-#
-# Place lastfile.$(O) in its own library so that it can be loaded after
-# the source libraries but before any system libraries.  Doing so defines
-# the end of Emacs' data section portably across compilers and systems.
-#
-$(TLASTLIB):    $(BLD)/lastfile.$(O)
-        - $(DEL) $@
-        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
-
-#
-# Assuming INSTALL_DIR is defined, build and install emacs in it.
-#
-install:        $(ALL)
-        - mkdir "$(INSTALL_DIR)/bin"
-        $(CP) $(EMACS) $(INSTALL_DIR)/bin
-
-#
-# Maintenance
-#
-# We used to delete *~, s/*~, m/*~ here, but that might inadvertently
-# remove precious files if it happens to match their short 8+3 aliases.
-clean:
-        - $(DEL) "s/*.h~" "m/*.h~"
-        - $(DEL) $(COMPILER_TEMP_FILES)
-        - $(DEL_TREE) $(OBJDIR)
-        - $(DEL) stamp_BLD gl-stamp globals.h
-        - $(DEL) buildobj.h
-
-distclean:      cleanall
-        - $(DEL) config.h epaths.h Makefile
-
-maintainer-clean: distclean
-        - $(DEL) TAGS
-
-cleanall:       clean
-        - $(DEL_TREE) obj
-        - $(DEL_TREE) obj-spd
-        - $(DEL_TREE) oo
-        - $(DEL_TREE) oo-spd
-
-## Arrange to make a tags table TAGS-LISP for ../lisp,
-## plus TAGS for the C files, which includes ../lisp/TAGS by reference.
-##
-## This works only with GNU Make.
-
-TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/inc/ms-w32.h
-        $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
-
-TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
-        $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE)
-
-TAGS-gmake:
-        ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \
-          --regex=@../nt/emacs-src.tags \
-          $(OBJ0_c)
-        ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(OBJ1_c)
-        ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(OBJ2_c) \
-          $(CURDIR)/*.h $(CURDIR)/../nt/inc/ms-w32.h
-
-TAGS-nmake:
-        echo This target is not supported with NMake
-        exit -1
-
-frc:
-TAGS-LISP-gmake: frc
-        $(MAKE) $(MFLAGS) -C ../lisp TAGS-LISP DEST=../src
-
-TAGS-LISP-nmake:
-        echo This target is not supported with NMake
-        exit -1
-
-../nt/TAGS: frc
-        $(MAKE) $(MFLAGS) nt-TAGS-$(MAKETYPE)
-
-nt-TAGS-gmake:
-        $(MAKE) $(MFLAGS) -C ../nt TAGS
-
-nt-TAGS-nmake:
-        echo This target is not supported with NMake
-        exit -1
-
-full-tags: TAGS TAGS-LISP ../nt/TAGS
-.PHONY: full-tags
-
-### DEPENDENCIES ###
-
-EMACS_ROOT = ..
-GNU_LIB = $(EMACS_ROOT)/lib
-NT_INC = $(EMACS_ROOT)/nt/inc
-
-ACL_H          = $(GNU_LIB)/acl.h \
-                 $(NT_INC)/sys/stat.h \
-                 $(NT_INC)/stdbool.h
-SYSTIME_H      = $(SRC)/systime.h \
-                 $(NT_INC)/sys/time.h \
-                 $(GNU_LIB)/timespec.h
-ATIMER_H       = $(SRC)/atimer.h \
-                 $(NT_INC)/stdbool.h \
-                 $(SYSTIME_H)
-BUFFER_H       = $(SRC)/buffer.h \
-                 $(SYSTIME_H)
-C_CTYPE_H      = $(GNU_LIB)/c-ctype.h \
-                 $(NT_INC)/stdbool.h
-CAREADLINKAT_H = $(GNU_LIB)/careadlinkat.h \
-                 $(NT_INC)/unistd.h
-CHARACTER_H    = $(SRC)/character.h \
-                 $(GNU_LIB)/verify.h
-CCL_H          = $(SRC)/ccl.h \
-                 $(CHARACTER_H)
-CHARSET_H      = $(SRC)/charset.h \
-                 $(GNU_LIB)/verify.h
-CODING_H       = $(SRC)/coding.h \
-                 $(SRC)/composite.h
-MS_W32_H       = $(NT_INC)/ms-w32.h \
-                 $(NT_INC)/sys/stat.h
-CONF_POST_H    = $(SRC)/conf_post.h \
-                 $(MS_W32_H)
-CONFIG_H       = $(SRC)/config.h \
-                 $(CONF_POST_H)
-W32GUI_H       = $(SRC)/w32gui.h \
-                 $(SYSTIME_H)
-DISPEXTERN_H   = $(SRC)/dispextern.h \
-                 $(GNU_LIB)/c-strcase.h \
-                 $(SYSTIME_H) \
-                 $(W32GUI_H)
-FILEMODE_H     = $(GNU_LIB)/filemode.h \
-                 $(NT_INC)/sys/stat.h
-FRAME_H        = $(SRC)/frame.h \
-                 $(DISPEXTERN_H)
-FONT_H         = $(SRC)/font.h \
-                 $(CCL_H) \
-                 $(FRAME_H)
-FTOASTR_H      = $(GNU_LIB)/ftoastr.h \
-                 $(GNU_LIB)/intprops.h
-GRP_H          = $(NT_INC)/grp.h \
-                 $(NT_INC)/pwd.h
-INTERVALS_H    = $(SRC)/intervals.h \
-                 $(SRC)/composite.h \
-                 $(DISPEXTERN_H)
-INTTYPES_H     = $(NT_INC)/inttypes.h \
-                 $(NT_INC)/stdint.h
-KEYBOARD_H     = $(SRC)/keyboard.h \
-                 $(CODING_H) \
-                 $(SYSTIME_H)
-LANGINFO_H     = $(NT_INC)/langinfo.h \
-                 $(NT_INC)/nl_types.h
-LISP_H         = $(SRC)/lisp.h \
-                 $(SRC)/globals.h \
-                 $(GNU_LIB)/intprops.h \
-                 $(INTTYPES_H) \
-                 $(NT_INC)/stdalign.h \
-                 $(NT_INC)/stdbool.h
-MD5_H          = $(GNU_LIB)/md5.h \
-                 $(NT_INC)/stdint.h
-MENU_H         = $(SRC)/menu.h \
-                 $(SYSTIME_H)
-PROCESS_H      = $(SRC)/process.h \
-                 $(SRC)/gnutls.h \
-                 $(NT_INC)/unistd.h
-SHA1_H         = $(GNU_LIB)/sha1.h \
-                 $(NT_INC)/stdint.h
-SHA256_H       = $(GNU_LIB)/sha256.h \
-                 $(NT_INC)/stdint.h
-U64_H          = $(GNU_LIB)/u64.h \
-                 $(NT_INC)/stdint.h
-SHA512_H       = $(GNU_LIB)/sha512.h \
-                 $(U64_H)
-SIG2STR_H      = $(GNU_LIB)/sig2str.h \
-                 $(GNU_LIB)/intprops.h
-SOCKET_H       = $(NT_INC)/sys/socket.h \
-                 $(SRC)/w32.h
-STAT_TIME_H    = $(GNU_LIB)/stat-time.h \
-                 $(NT_INC)/sys/stat.h
-SYSSIGNAL_H    = $(SRC)/syssignal.h \
-                 $(NT_INC)/stdbool.h
-SYSTTY_H       = $(SRC)/systty.h \
-                 $(NT_INC)/sys/ioctl.h \
-                 $(NT_INC)/unistd.h
-SYSWAIT_H      = $(SRC)/syswait.h \
-                 $(NT_INC)/stdbool.h \
-                 $(NT_INC)/sys/wait.h
-TERMHOOKS_H    = $(SRC)/termhooks.h \
-                 $(SYSTIME_H)
-W32FONT_H      = $(SRC)/w32font.h \
-                 $(FONT_H)
-W32TERM_H      = $(SRC)/w32term.h \
-                 $(ATIMER_H) \
-                 $(FRAME_H) \
-                 $(W32GUI_H)
-WINDOW_H       = $(SRC)/window.h \
-                 $(DISPEXTERN_H)
-
-$(BLD)/alloc.$(O) : \
-        $(SRC)/alloc.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/puresize.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32heap.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/verify.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/atimer.$(O) : \
-        $(SRC)/atimer.c \
-        $(SRC)/blockinput.h \
-        $(NT_INC)/unistd.h \
-        $(ATIMER_H) \
-        $(CONFIG_H) \
-        $(LISP_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H)
-
-$(BLD)/bidi.$(O) : \
-        $(SRC)/bidi.c \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(LISP_H)
-
-$(BLD)/buffer.$(O) : \
-        $(SRC)/buffer.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/indent.h \
-        $(SRC)/keymap.h \
-        $(SRC)/region-cache.h \
-        $(NT_INC)/sys/param.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/verify.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/bytecode.$(O) : \
-        $(SRC)/bytecode.c \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/callint.$(O) : \
-        $(SRC)/callint.c \
-        $(SRC)/commands.h \
-        $(SRC)/keymap.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/callproc.$(O) : \
-        $(SRC)/callproc.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/epaths.h \
-        $(SRC)/w32.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTTY_H) \
-        $(SYSWAIT_H) \
-        $(TERMHOOKS_H)
-
-$(BLD)/casefiddle.$(O) : \
-        $(SRC)/casefiddle.c \
-        $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/keymap.h \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/casetab.$(O) : \
-        $(SRC)/casetab.c \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/category.$(O) : \
-        $(SRC)/category.c \
-        $(SRC)/category.h \
-        $(SRC)/keymap.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/ccl.$(O) : \
-        $(SRC)/ccl.c \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/character.$(O) : \
-        $(SRC)/character.c \
-        $(SRC)/composite.h \
-        $(SRC)/disptab.h \
-        $(GNU_LIB)/intprops.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/charset.$(O) : \
-        $(SRC)/charset.c \
-        $(SRC)/disptab.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(LISP_H)
-
-$(BLD)/chartab.$(O) : \
-        $(SRC)/chartab.c \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/cmds.$(O) : \
-        $(SRC)/cmds.c \
-        $(SRC)/commands.h \
-        $(SRC)/keymap.h \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/coding.$(O) : \
-        $(SRC)/coding.c \
-        $(SRC)/composite.h \
-        $(BUFFER_H) \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/composite.$(O) : \
-        $(SRC)/composite.c \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/data.$(O) : \
-        $(SRC)/data.c \
-        $(SRC)/keymap.h \
-        $(SRC)/puresize.h \
-        $(GNU_LIB)/intprops.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(SYSSIGNAL_H) \
-        $(TERMHOOKS_H)
-
-$(BLD)/dired.$(O) : \
-        $(SRC)/dired.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/regex.h \
-        $(NT_INC)/dirent.h \
-        $(NT_INC)/pwd.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FILEMODE_H) \
-        $(GRP_H) \
-        $(LISP_H) \
-        $(STAT_TIME_H) \
-        $(SYSTIME_H)
-
-$(BLD)/dispnew.$(O) : \
-        $(SRC)/dispnew.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/cm.h \
-        $(SRC)/commands.h \
-        $(SRC)/disptab.h \
-        $(SRC)/indent.h \
-        $(SRC)/termchar.h \
-        $(SRC)/w32.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/fpending.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/doc.$(O) : \
-        $(SRC)/doc.c \
-        $(SRC)/buildobj.h \
-        $(SRC)/keymap.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H)
-
-$(BLD)/doprnt.$(O) : \
-        $(SRC)/doprnt.c \
-        $(NT_INC)/unistd.h \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/editfns.$(O) : \
-        $(SRC)/editfns.c \
-        $(SRC)/blockinput.h \
-        $(NT_INC)/pwd.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/intprops.h \
-        $(GNU_LIB)/strftime.h \
-        $(GNU_LIB)/verify.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(GRP_H) \
-        $(INTERVALS_H) \
-        $(LISP_H) \
-        $(SYSTIME_H) \
-        $(WINDOW_H)
-
-$(BLD)/emacs.$(O) : \
-        $(SRC)/emacs.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/gnutls.h \
-        $(SRC)/keymap.h \
-        $(SRC)/unexec.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32common.h \
-        $(SRC)/w32heap.h \
-        $(SRC)/w32select.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/close-stream.h \
-        $(ATIMER_H) \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTTY_H) \
-        $(TERMHOOKS_H) \
-        $(W32FONT_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/eval.$(O) : \
-        $(SRC)/eval.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H)
-
-$(BLD)/fileio.$(O) : \
-        $(SRC)/fileio.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/w32.h \
-        $(NT_INC)/pwd.h \
-        $(NT_INC)/sys/acl.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/allocator.h \
-        $(ACL_H) \
-        $(BUFFER_H) \
-        $(CAREADLINKAT_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(LISP_H) \
-        $(STAT_TIME_H) \
-        $(SYSTIME_H) \
-        $(WINDOW_H)
-
-$(BLD)/filelock.$(O) : \
-        $(SRC)/filelock.c \
-        $(SRC)/w32.h \
-        $(NT_INC)/pwd.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(LISP_H) \
-        $(SYSTIME_H)
-
-$(BLD)/firstfile.$(O) : \
-        $(SRC)/firstfile.c \
-        $(CONFIG_H)
-
-$(BLD)/floatfns.$(O) : \
-        $(SRC)/floatfns.c \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/fns.$(O) : \
-        $(SRC)/fns.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/keymap.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/intprops.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LANGINFO_H) \
-        $(LISP_H) \
-        $(MD5_H) \
-        $(SHA1_H) \
-        $(SHA256_H) \
-        $(SHA512_H) \
-        $(WINDOW_H)
-
-$(BLD)/font.$(O) : \
-        $(SRC)/font.c \
-        $(SRC)/composite.h \
-        $(SRC)/fontset.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/fontset.$(O) : \
-        $(SRC)/fontset.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/fontset.h \
-        $(BUFFER_H) \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/frame.$(O) : \
-        $(SRC)/frame.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/fontset.h \
-        $(SRC)/termchar.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/fringe.$(O) : \
-        $(SRC)/fringe.c \
-        $(SRC)/blockinput.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/gmalloc.$(O) : \
-        $(SRC)/gmalloc.c \
-        $(SRC)/w32heap.h \
-        $(NT_INC)/stdint.h \
-        $(NT_INC)/unistd.h \
-        $(CONFIG_H)
-
-$(BLD)/gnutls.$(O) : \
-        $(SRC)/gnutls.c \
-        $(SRC)/w32.h \
-        $(CONFIG_H) \
-        $(LISP_H) \
-        $(PROCESS_H)
-
-$(BLD)/xml.$(O) : \
-        $(SRC)/xml.c \
-        $(SRC)/w32.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/profiler.$(O) : \
-        $(SRC)/profiler.c \
-        $(CONFIG_H) \
-        $(LISP_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H)
-
-$(BLD)/image.$(O) : \
-        $(SRC)/image.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/epaths.h \
-        $(SRC)/w32.h \
-        $(NT_INC)/unistd.h \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(SYSTIME_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/indent.$(O) : \
-        $(SRC)/indent.c \
-        $(SRC)/category.h \
-        $(SRC)/composite.h \
-        $(SRC)/disptab.h \
-        $(SRC)/indent.h \
-        $(SRC)/region-cache.h \
-        $(SRC)/termchar.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/insdel.$(O) : \
-        $(SRC)/insdel.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/region-cache.h \
-        $(GNU_LIB)/intprops.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(INTERVALS_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/intervals.$(O) : \
-        $(SRC)/intervals.c \
-        $(SRC)/keymap.h \
-        $(SRC)/puresize.h \
-        $(GNU_LIB)/intprops.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H)
-
-$(BLD)/keyboard.$(O) : \
-        $(SRC)/keyboard.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/disptab.h \
-        $(SRC)/keymap.h \
-        $(SRC)/macros.h \
-        $(SRC)/puresize.h \
-        $(SRC)/syntax.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termopts.h \
-        $(NT_INC)/sys/ioctl.h \
-        $(NT_INC)/unistd.h \
-        $(ATIMER_H) \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/keymap.$(O) : \
-        $(SRC)/keymap.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/keymap.h \
-        $(SRC)/puresize.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/lastfile.$(O) : \
-        $(SRC)/lastfile.c \
-        $(CONFIG_H)
-
-$(BLD)/lread.$(O) : \
-        $(SRC)/lread.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/epaths.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(STAT_TIME_H) \
-        $(TERMHOOKS_H)
-
-$(BLD)/macros.$(O) : \
-        $(SRC)/macros.c \
-        $(SRC)/commands.h \
-        $(SRC)/macros.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/marker.$(O) : \
-        $(SRC)/marker.c \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/menu.$(O) : \
-        $(SRC)/menu.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/keymap.h \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(MENU_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/minibuf.$(O) : \
-        $(SRC)/minibuf.c \
-        $(SRC)/commands.h \
-        $(SRC)/keymap.h \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/w32.$(O) : \
-        $(SRC)/w32.c \
-        $(SRC)/w32.h \
-        $(SRC)/w32common.h \
-        $(SRC)/w32heap.h \
-        $(SRC)/w32select.h \
-        $(NT_INC)/dirent.h \
-        $(NT_INC)/pwd.h \
-        $(NT_INC)/sys/acl.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/time.h \
-        $(GNU_LIB)/allocator.h \
-        $(CAREADLINKAT_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(GRP_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SOCKET_H) \
-        $(SYSTIME_H)
-
-$(BLD)/w32heap.$(O) : \
-        $(SRC)/w32heap.c \
-        $(SRC)/w32common.h \
-        $(SRC)/w32heap.h \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/w32inevt.$(O) : \
-        $(SRC)/w32inevt.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/termchar.h \
-        $(SRC)/w32heap.h \
-        $(SRC)/w32inevt.h \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/w32proc.$(O) : \
-        $(SRC)/w32proc.c \
-        $(SRC)/w32.h \
-        $(SRC)/w32common.h \
-        $(SRC)/w32heap.h \
-        $(NT_INC)/nl_types.h \
-        $(NT_INC)/sys/file.h \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(LANGINFO_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H) \
-        $(SYSWAIT_H) \
-        $(W32TERM_H)
-
-$(BLD)/w32console.$(O) : \
-        $(SRC)/w32console.c \
-        $(SRC)/disptab.h \
-        $(SRC)/termchar.h \
-        $(SRC)/w32common.h \
-        $(SRC)/w32inevt.h \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/print.$(O) : \
-        $(SRC)/print.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/termchar.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(FTOASTR_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/process.$(O) : \
-        $(SRC)/process.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/composite.h \
-        $(SRC)/gnutls.h \
-        $(SRC)/sysselect.h \
-        $(SRC)/termopts.h \
-        $(NT_INC)/arpa/inet.h \
-        $(NT_INC)/netdb.h \
-        $(NT_INC)/netinet/in.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/ioctl.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(ATIMER_H) \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SIG2STR_H) \
-        $(SOCKET_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H) \
-        $(SYSTTY_H) \
-        $(SYSWAIT_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/ralloc.$(O) : \
-        $(SRC)/ralloc.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/getpagesize.h \
-        $(NT_INC)/unistd.h \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/regex.$(O) : \
-        $(SRC)/regex.c \
-        $(SRC)/category.h \
-        $(SRC)/regex.h \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/region-cache.$(O) : \
-        $(SRC)/region-cache.c \
-        $(SRC)/region-cache.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/scroll.$(O) : \
-        $(SRC)/scroll.c \
-        $(SRC)/termchar.h \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/search.$(O) : \
-        $(SRC)/search.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/category.h \
-        $(SRC)/commands.h \
-        $(SRC)/regex.h \
-        $(SRC)/region-cache.h \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(INTERVALS_H) \
-        $(LISP_H)
-
-$(BLD)/sound.$(O) : \
-        $(SRC)/sound.c \
-        $(NT_INC)/unistd.h \
-        $(ATIMER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(LISP_H) \
-        $(SYSSIGNAL_H)
-
-$(BLD)/syntax.$(O) : \
-        $(SRC)/syntax.c \
-        $(SRC)/category.h \
-        $(SRC)/commands.h \
-        $(SRC)/keymap.h \
-        $(SRC)/regex.h \
-        $(SRC)/syntax.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(INTERVALS_H) \
-        $(LISP_H)
-
-$(BLD)/sysdep.$(O) : \
-        $(SRC)/sysdep.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/cm.h \
-        $(SRC)/sysselect.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termopts.h \
-        $(NT_INC)/netdb.h \
-        $(NT_INC)/pwd.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/param.h \
-        $(NT_INC)/sys/stat.h \
-        $(NT_INC)/unistd.h \
-        $(GNU_LIB)/execinfo.h \
-        $(GNU_LIB)/utimens.h \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(GRP_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SOCKET_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTIME_H) \
-        $(SYSTTY_H) \
-        $(SYSWAIT_H) \
-        $(TERMHOOKS_H) \
-        $(WINDOW_H)
-
-$(BLD)/term.$(O) : \
-        $(SRC)/term.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/cm.h \
-        $(SRC)/composite.h \
-        $(SRC)/disptab.h \
-        $(SRC)/keymap.h \
-        $(SRC)/termchar.h \
-        $(SRC)/tparam.h \
-        $(NT_INC)/sys/file.h \
-        $(NT_INC)/sys/time.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(SYSSIGNAL_H) \
-        $(SYSTTY_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/terminal.$(O) : \
-        $(SRC)/terminal.c \
-        $(SRC)/termchar.h \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H)
-
-$(BLD)/textprop.$(O) : \
-        $(SRC)/textprop.c \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(INTERVALS_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/tparam.$(O) : \
-        $(SRC)/tparam.c \
-        $(SRC)/tparam.h \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/undo.$(O) : \
-        $(SRC)/undo.c \
-        $(SRC)/commands.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(LISP_H) \
-        $(WINDOW_H)
-
-$(BLD)/unexw32.$(O) : \
-        $(SRC)/unexw32.c \
-        $(SRC)/unexec.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32common.h \
-        $(SRC)/w32heap.h \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/vm-limit.$(O) : \
-        $(SRC)/vm-limit.c \
-        $(SRC)/w32heap.h \
-        $(NT_INC)/unistd.h \
-        $(CONFIG_H) \
-        $(LISP_H)
-
-$(BLD)/window.$(O) : \
-        $(SRC)/window.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/disptab.h \
-        $(SRC)/indent.h \
-        $(SRC)/keymap.h \
-        $(SRC)/termchar.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/xdisp.$(O) : \
-        $(SRC)/xdisp.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/commands.h \
-        $(SRC)/disptab.h \
-        $(SRC)/fontset.h \
-        $(SRC)/indent.h \
-        $(SRC)/keymap.h \
-        $(SRC)/macros.h \
-        $(SRC)/region-cache.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termopts.h \
-        $(ATIMER_H) \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/xfaces.$(O) : \
-        $(SRC)/xfaces.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/fontset.h \
-        $(SRC)/termchar.h \
-        $(NT_INC)/sys/stat.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(C_CTYPE_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/w32fns.$(O) : \
-        $(SRC)/w32fns.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/epaths.h \
-        $(SRC)/fontset.h \
-        $(SRC)/w32.h \
-        $(SRC)/w32common.h \
-        $(SRC)/w32heap.h \
-        $(NT_INC)/unistd.h \
-        $(BUFFER_H) \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(SYSTIME_H) \
-        $(TERMHOOKS_H) \
-        $(W32FONT_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/w32menu.$(O) : \
-        $(SRC)/w32menu.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/keymap.h \
-        $(SRC)/w32common.h \
-        $(BUFFER_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(MENU_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/w32term.$(O) : \
-        $(SRC)/w32term.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/disptab.h \
-        $(SRC)/fontset.h \
-        $(SRC)/keymap.h \
-        $(SRC)/termchar.h \
-        $(SRC)/termopts.h \
-        $(SRC)/w32heap.h \
-        $(NT_INC)/sys/stat.h \
-        $(ATIMER_H) \
-        $(BUFFER_H) \
-        $(CCL_H) \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(INTERVALS_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(PROCESS_H) \
-        $(SYSTIME_H) \
-        $(SYSTTY_H) \
-        $(TERMHOOKS_H) \
-        $(W32FONT_H) \
-        $(W32TERM_H) \
-        $(WINDOW_H)
-
-$(BLD)/w32select.$(O) : \
-        $(SRC)/w32select.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/composite.h \
-        $(SRC)/w32common.h \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(W32TERM_H)
-
-$(BLD)/w32reg.$(O) : \
-        $(SRC)/w32reg.c \
-        $(SRC)/blockinput.h \
-        $(CONFIG_H) \
-        $(LISP_H) \
-        $(W32TERM_H)
-
-$(BLD)/w32xfns.$(O) : \
-        $(SRC)/w32xfns.c \
-        $(SRC)/blockinput.h \
-        $(SRC)/fontset.h \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(W32TERM_H)
-
-$(BLD)/w32font.$(O) : \
-        $(SRC)/w32font.c \
-        $(SRC)/fontset.h \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(W32FONT_H) \
-        $(W32TERM_H)
-
-$(BLD)/w32uniscribe.$(O) : \
-        $(SRC)/w32uniscribe.c \
-        $(SRC)/composite.h \
-        $(SRC)/fontset.h \
-        $(CHARACTER_H) \
-        $(CHARSET_H) \
-        $(CONFIG_H) \
-        $(DISPEXTERN_H) \
-        $(FONT_H) \
-        $(FRAME_H) \
-        $(LISP_H) \
-        $(W32FONT_H) \
-        $(W32TERM_H)
-
-$(BLD)/w32notify.$(O) : \
-        $(SRC)/w32notify.c \
-        $(SRC)/w32.h \
-        $(SRC)/w32common.h \
-        $(CODING_H) \
-        $(CONFIG_H) \
-        $(FRAME_H) \
-        $(KEYBOARD_H) \
-        $(LISP_H) \
-        $(TERMHOOKS_H) \
-        $(W32TERM_H)
-
-# Each object file depends on stamp_BLD, because in parallel builds we must
-# make sure $(BLD) exists before starting compilations.
-#
-$(OBJ0) $(OBJ1) $(OBJ2) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD
diff --git a/src/nsimage.m b/src/nsimage.m
index 9302cd2f212..13e8504f460 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -102,7 +102,7 @@ ns_load_image (struct frame *f, struct image *img,
 
   if (eImg == nil)
     {
-      add_to_log ("Unable to load image %s", img->spec, Qnil);
+      add_to_log ("Unable to load image %s", img->spec);
       return 0;
     }
 
diff --git a/src/regex.c b/src/regex.c
index 38c5e350541..dcf286454b3 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -1544,9 +1544,9 @@ do {									\
   DEBUG_PRINT ("  Push frame index: %zd\n", fail_stack.frame);          \
   PUSH_FAILURE_INT (fail_stack.frame);                                  \
                                                                         \
-  DEBUG_PRINT ("  Push string %p: `", string_place);                    \
+  DEBUG_PRINT ("  Push string %p: \"", string_place);                   \
   DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2, size2);\
-  DEBUG_PRINT ("'\n");                                                  \
+  DEBUG_PRINT ("\"\n");                                                 \
   PUSH_FAILURE_POINTER (string_place);                                  \
                                                                         \
   DEBUG_PRINT ("  Push pattern %p: ", pattern);                         \
@@ -1598,9 +1598,9 @@ do {									\
      on_failure_keep_string_jump opcode, and we want to throw away the  \
      saved NULL, thus retaining our current position in the string.  */ \
   str = POP_FAILURE_POINTER ();                                         \
-  DEBUG_PRINT ("  Popping string %p: `", str);                          \
+  DEBUG_PRINT ("  Popping string %p: \"", str);                         \
   DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2);      \
-  DEBUG_PRINT ("'\n");                                                  \
+  DEBUG_PRINT ("\"\n");                                                 \
                                                                         \
   fail_stack.frame = POP_FAILURE_INT ();                                \
   DEBUG_PRINT ("  Popping  frame index: %zd\n", fail_stack.frame);      \
@@ -5127,9 +5127,9 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1,
 
   DEBUG_PRINT ("The compiled pattern is: ");
   DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend);
-  DEBUG_PRINT ("The string to match is: `");
+  DEBUG_PRINT ("The string to match is: \"");
   DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2);
-  DEBUG_PRINT ("'\n");
+  DEBUG_PRINT ("\"\n");
 
   /* This loops over pattern commands.  It exits by returning from the
      function if the match is complete, or it drops through if the match
@@ -5435,7 +5435,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1,
                     && buf_ch == '\000'))
               goto fail;
 
-            DEBUG_PRINT ("  Matched `%d'.\n", *d);
+            DEBUG_PRINT ("  Matched \"%d\".\n", *d);
             d += buf_charlen;
           }
           break;
diff --git a/src/regex.h b/src/regex.h
index 3dfecf0a7e5..c89ca46d4bd 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -603,7 +603,9 @@ typedef wchar_t re_wchar_t;
 # define re_wctype_to_bit(cc) 0
 #else
 # define CHAR_CLASS_MAX_LENGTH  9 /* Namely, `multibyte'.  */
-# define btowc(c) c
+# ifndef emacs
+#  define btowc(c) c
+# endif
 
 /* Character classes.  */
 typedef enum { RECC_ERROR = 0,
diff --git a/src/syntax.c b/src/syntax.c
index 0d8b08c01b6..d543a5f9823 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1333,7 +1333,10 @@ DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value,
     insert_string (" (nestable)");
 
   if (prefix)
-    insert_string (",\n\t  is a prefix character for `backward-prefix-chars'");
+    insert1 (CALLN (Fformat,
+                    (build_string
+                     (",\n\t  is a prefix character for "
+                      uLSQM"backward-prefix-chars"uRSQM))));
 
   return syntax;
 }
diff --git a/src/sysdep.c b/src/sysdep.c
index df3e573a6ea..25f111ad0ed 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1612,7 +1612,7 @@ handle_arith_signal (int sig)
   xsignal0 (Qarith_error);
 }
 
-#ifdef HAVE_STACK_OVERFLOW_HANDLING
+#if defined HAVE_STACK_OVERFLOW_HANDLING && !defined WINDOWSNT
 
 /* Alternate stack used by SIGSEGV handler below.  */
 
@@ -1708,7 +1708,7 @@ init_sigsegv (void)
   return sigaction (SIGSEGV, &sa, NULL) < 0 ? 0 : 1;
 }
 
-#else /* not HAVE_STACK_OVERFLOW_HANDLING */
+#else /* not HAVE_STACK_OVERFLOW_HANDLING or WINDOWSNT */
 
 static bool
 init_sigsegv (void)
@@ -1716,7 +1716,7 @@ init_sigsegv (void)
   return 0;
 }
 
-#endif /* HAVE_STACK_OVERFLOW_HANDLING */
+#endif /* HAVE_STACK_OVERFLOW_HANDLING && !WINDOWSNT */
 
 static void
 deliver_arith_signal (int sig)
diff --git a/src/w32fns.c b/src/w32fns.c
index ad93bd41851..2cb99c90057 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2941,7 +2941,11 @@ get_wm_chars (HWND aWnd, int *buf, int buflen, int ignore_ctrl, int ctrl,
    environments!) should  have different values.  Moreover, switching to a
    non-Emacs window with the same language environment, and using (dead)keys
    there would change the value stored in the kernel, but not this value.  */
-static int after_deadkey = 0;
+/* A layout may emit deadkey=0.  It looks like this would reset the state
+   of the kernel's finite automaton (equivalent to emiting 0-length string,
+   which is otherwise impossible in the dead-key map of a layout).
+   Be ready to treat the case when this delivers WM_(SYS)DEADCHAR. */
+static int after_deadkey = -1;
 
 int
 deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam,
@@ -2951,7 +2955,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam,
      points to a keypress.
      (However, the "old style" TranslateMessage() would deliver at most 16 of
      them.)  Be on a safe side, and prepare to treat many more.  */
-  int ctrl_cnt, buf[1024], count, is_dead, after_dead = (after_deadkey != -1);
+  int ctrl_cnt, buf[1024], count, is_dead, after_dead = (after_deadkey > 0);
 
   /* Since the keypress processing logic of Windows has a lot of state, it
      is important to call TranslateMessage() for every keyup/keydown, AND
@@ -3131,7 +3135,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam,
             }
           else if (wmsg.dwModifiers & (alt_modifier | meta_modifier)
                    || (console_modifiers
-                       & (RIGHT_WIN_PRESSED | RIGHT_WIN_PRESSED
+                       & (LEFT_WIN_PRESSED | RIGHT_WIN_PRESSED
                           | APPS_PRESSED | SCROLLLOCK_ON)))
             {
               /* Pure Alt (or combination of Alt, Win, APPS, scrolllock.  */
@@ -9239,18 +9243,71 @@ static DWORD except_code;
 static PVOID except_addr;
 
 #ifndef CYGWIN
+
+/* Stack overflow recovery.  */
+
+/* Re-establish the guard page at stack limit.  This is needed because
+   when a stack overflow is detected, Windows removes the guard bit
+   from the guard page, so if we don't re-establish that protection,
+   the next stack overflow will cause a crash.  */
+void
+w32_reset_stack_overflow_guard (void)
+{
+  /* MinGW headers don't declare this (should be in malloc.h).  */
+  _CRTIMP int __cdecl _resetstkoflw (void);
+
+  /* We ignore the return value.  If _resetstkoflw fails, the next
+     stack overflow will crash the program.  */
+  (void)_resetstkoflw ();
+}
+
+static void
+stack_overflow_handler (void)
+{
+  /* Hard GC error may lead to stack overflow caused by
+     too nested calls to mark_object.  No way to survive.  */
+  if (gc_in_progress)
+    terminate_due_to_signal (SIGSEGV, 40);
+#ifdef _WIN64
+  /* See ms-w32.h: MinGW64's longjmp crashes if invoked in this context.  */
+  __builtin_longjmp (return_to_command_loop, 1);
+#else
+  sys_longjmp (return_to_command_loop, 1);
+#endif
+}
+
 /* This handler records the exception code and the address where it
    was triggered so that this info could be included in the backtrace.
    Without that, the backtrace in some cases has no information
    whatsoever about the offending code, and looks as if the top-level
-   exception handler in the MinGW startup code di the one that
-   crashed.  */
+   exception handler in the MinGW startup code was the one that
+   crashed.  We also recover from stack overflow, by calling our stack
+   overflow handler that jumps back to top level.  */
 static LONG CALLBACK
 my_exception_handler (EXCEPTION_POINTERS * exception_data)
 {
   except_code = exception_data->ExceptionRecord->ExceptionCode;
   except_addr = exception_data->ExceptionRecord->ExceptionAddress;
 
+  /* If this is a stack overflow exception, attempt to recover.  */
+  if (exception_data->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW
+      && exception_data->ExceptionRecord->NumberParameters == 2
+      /* We can only longjmp to top level from the main thread.  */
+      && GetCurrentThreadId () == dwMainThreadId)
+    {
+      /* Call stack_overflow_handler ().  */
+#ifdef _WIN64
+      exception_data->ContextRecord->Rip = (DWORD_PTR) &stack_overflow_handler;
+#else
+      exception_data->ContextRecord->Eip = (DWORD_PTR) &stack_overflow_handler;
+#endif
+      /* Zero this out, so the stale address of the stack overflow
+         exception we handled is not displayed in some future
+         unrelated crash.  */
+      except_addr = 0;
+      return EXCEPTION_CONTINUE_EXECUTION;
+    }
+
   if (prev_exception_handler)
     return prev_exception_handler (exception_data);
   return EXCEPTION_EXECUTE_HANDLER;
@@ -9448,6 +9505,10 @@ globals_of_w32fns (void)
   InitCommonControls ();
 
   syms_of_w32uniscribe ();
+
+  /* Needed for recovery from C stack overflows in batch mode.  */
+  if (noninteractive)
+    dwMainThreadId = GetCurrentThreadId ();
 }
 
 #ifdef NTGUI_UNICODE
diff --git a/src/xdisp.c b/src/xdisp.c
index e45cb8702b2..6d747ebc5ce 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4187,13 +4187,13 @@ handle_invisible_prop (struct it *it)
 
   if (STRINGP (it->string))
     {
-      Lisp_Object end_charpos, limit, charpos;
+      Lisp_Object end_charpos, limit;
 
       /* Get the value of the invisible text property at the
          current position.  Value will be nil if there is no such
          property.  */
-      charpos = make_number (IT_STRING_CHARPOS (*it));
-      prop = Fget_text_property (charpos, Qinvisible, it->string);
+      end_charpos = make_number (IT_STRING_CHARPOS (*it));
+      prop = Fget_text_property (end_charpos, Qinvisible, it->string);
       invis = TEXT_PROP_MEANS_INVISIBLE (prop);
 
       if (invis != 0 && IT_STRING_CHARPOS (*it) < it->end_charpos)
@@ -4211,8 +4211,12 @@ handle_invisible_prop (struct it *it)
           XSETINT (limit, len);
           do
             {
-              end_charpos = Fnext_single_property_change (charpos, Qinvisible,
-                                                          it->string, limit);
+              end_charpos
+                = Fnext_single_property_change (end_charpos, Qinvisible,
+                                                it->string, limit);
+              /* Since LIMIT is always an integer, so should be the
+                 value returned by Fnext_single_property_change.  */
+              eassert (INTEGERP (end_charpos));
               if (INTEGERP (end_charpos))
                 {
                   endpos = XFASTINT (end_charpos);
@@ -4221,6 +4225,8 @@ handle_invisible_prop (struct it *it)
                   if (invis == 2)
                     display_ellipsis_p = true;
                 }
+              else /* Should never happen; but if it does, exit the loop.  */
+                endpos = len;
             }
           while (invis != 0 && endpos < len);
 
@@ -4256,7 +4262,7 @@ handle_invisible_prop (struct it *it)
                 }
               else
                 {
-                  IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos);
+                  IT_STRING_CHARPOS (*it) = endpos;
                   compute_string_pos (&it->current.string_pos, old, it->string);
                 }
             }
@@ -5966,6 +5972,7 @@ pop_it (struct it *it)
 {
   struct iterator_stack_entry *p;
   bool from_display_prop = it->from_disp_prop_p;
+  ptrdiff_t prev_pos = IT_CHARPOS (*it);
 
   eassert (it->sp > 0);
   --it->sp;
@@ -6054,6 +6061,11 @@ pop_it (struct it *it)
                    && IT_STRING_BYTEPOS (*it) == it->bidi_it.bytepos)
                || (CONSP (it->object) && it->method == GET_FROM_STRETCH));
     }
+  /* If we move the iterator over text covered by a display property
+     to a new buffer position, any info about previously seen overlays
+     is no longer valid.  */
+  if (from_display_prop && it->sp == 0 && CHARPOS (it->position) != prev_pos)
+    it->ignore_overlay_strings_at_pos_p = false;
 }
 
 
@@ -6878,9 +6890,10 @@ get_next_display_element (struct it *it)
              non-ASCII spaces and hyphens specially.  */
           if (! ASCII_CHAR_P (c) && ! NILP (Vnobreak_char_display))
             {
-              if (c == 0xA0)
+              if (c == NO_BREAK_SPACE)
                 nonascii_space_p = true;
-              else if (c == 0xAD || c == 0x2010 || c == 0x2011)
+              else if (c == SOFT_HYPHEN || c == HYPHEN
+                       || c == NON_BREAKING_HYPHEN)
                 nonascii_hyphen_p = true;
             }
 
@@ -9784,27 +9797,50 @@ include the height of both, if present, in the return value.  */)
                                Messages
  ***********************************************************************/
 
+/* Return the number of arguments the format string FORMAT needs.  */
+
+static ptrdiff_t
+format_nargs (char const *format)
+{
+  ptrdiff_t nargs = 0;
+  for (char const *p = format; (p = strchr (p, '%')); p++)
+    if (p[1] == '%')
+      p++;
+    else
+      nargs++;
+  return nargs;
+}
 
-/* Add a message with format string FORMAT and arguments ARG1 and ARG2
+/* Add a message with format string FORMAT and formatted arguments
    to *Messages*.  */
 
 void
-add_to_log (const char *format, Lisp_Object arg1, Lisp_Object arg2)
+add_to_log (const char *format, ...)
 {
-  Lisp_Object msg, fmt;
-  char *buffer;
-  ptrdiff_t len;
-  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
-  USE_SAFE_ALLOCA;
-
-  fmt = msg = Qnil;
-  GCPRO4 (fmt, msg, arg1, arg2);
+  va_list ap;
+  va_start (ap, format);
+  vadd_to_log (format, ap);
+  va_end (ap);
+}
 
-  fmt = build_string (format);
-  msg = CALLN (Fformat, fmt, arg1, arg2);
+void
+vadd_to_log (char const *format, va_list ap)
+{
+  ptrdiff_t nargs = 1 + format_nargs (format);
+  Lisp_Object args[10];
+  eassert (nargs <= ARRAYELTS (args));
+  args[0] = build_string (format);
+  for (ptrdiff_t i = 1; i <= nargs; i++)
+    args[i] = va_arg (ap, Lisp_Object);
+  Lisp_Object msg = Qnil;
+  struct gcpro gcpro1, gcpro2;
+  GCPRO2 (args, msg);
+  gcpro1.nvars = nargs;
+  msg = Fformat (nargs, args);
 
-  len = SBYTES (msg) + 1;
-  buffer = SAFE_ALLOCA (len);
+  ptrdiff_t len = SBYTES (msg) + 1;
+  USE_SAFE_ALLOCA;
+  char *buffer = SAFE_ALLOCA (len);
   memcpy (buffer, SDATA (msg), len);
 
   message_dolog (buffer, len - 1, true, false);
@@ -10239,9 +10275,9 @@ message_with_string (const char *m, Lisp_Object string, bool log)
 /* Dump an informative message to the minibuf.  If M is 0, clear out
    any existing message, and let the mini-buffer text show through.
 
-   The message must be safe ASCII only.  If strings may contain escape
-   sequences or non-ASCII characters, convert them to Lisp strings and
-   use Fmessage.  */
+   The message must be safe ASCII and the format must not contain ` or
+   '.  If your message and format do not fit into this category,
+   convert your arguments to Lisp objects and use Fmessage instead.  */
 
 static void ATTRIBUTE_FORMAT_PRINTF (1, 0)
 vmessage (const char *m, va_list ap)
@@ -19216,7 +19252,7 @@ append_space_for_newline (struct it *it, bool default_face_p)
              funny, and height of empty lines will be incorrect.  */
           g = it->glyph_row->glyphs[TEXT_AREA] + n;
           struct font *font = face->font ? face->font : FRAME_FONT (it->f);
-          if (n == 0 || it->glyph_row->height < font->pixel_size)
+          if (n == 0)
             {
               Lisp_Object height, total_height;
               int extra_line_spacing = it->extra_line_spacing;
diff --git a/src/xfaces.c b/src/xfaces.c
index f0b6d393f99..d519578198b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -797,7 +797,7 @@ load_pixmap (struct frame *f, Lisp_Object name)
 
   if (bitmap_id < 0)
     {
-      add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil);
+      add_to_log ("Invalid or undefined bitmap "uLSQM"%s"uRSQM, name);
       bitmap_id = 0;
     }
   else
@@ -1099,7 +1099,7 @@ load_color2 (struct frame *f, struct face *face, Lisp_Object name,
      to the values in an existing cell. */
   if (!defined_color (f, SSDATA (name), color, true))
     {
-      add_to_log ("Unable to load color \"%s\"", name, Qnil);
+      add_to_log ("Unable to load color \"%s\"", name);
 
       switch (target_index)
         {
@@ -2247,7 +2247,7 @@ merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to,
           else
             {
               if (err_msgs)
-                add_to_log ("Invalid face color", color_name, Qnil);
+                add_to_log ("Invalid face color %S", color_name);
               ok = false;
             }
         }
@@ -2452,7 +2452,7 @@ merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to,
       /* FACE_REF ought to be a face name.  */
       ok = merge_named_face (f, face_ref, to, named_merge_points);
       if (!ok && err_msgs)
-        add_to_log ("Invalid face reference: %s", face_ref, Qnil);
+        add_to_log ("Invalid face reference: %s", face_ref);
     }
 
   return ok;
diff --git a/src/xselect.c b/src/xselect.c
index bd2d65e795f..b54ddd83237 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2147,8 +2147,10 @@ x_clipboard_manager_save (Lisp_Object frame)
 static Lisp_Object
 x_clipboard_manager_error_1 (Lisp_Object err)
 {
-  AUTO_STRING (format, "X clipboard manager error: %s\n\
-If the problem persists, set `x-select-enable-clipboard-manager' to nil.");
+  Lisp_Object format
+    = build_string ("X clipboard manager error: %s\n"
+                    "If the problem persists, set "
+                    uLSQM"x-select-enable-clipboard-manager"uRSQM" to nil.");
   CALLN (Fmessage, format, CAR (CDR (err)));
   return Qnil;
 }
diff --git a/src/xsettings.c b/src/xsettings.c
index 028487b91ee..f6a8bfdebd9 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -537,10 +537,10 @@ parse_settings (unsigned char *prop,
               else
                 settings->seen &= ~SEEN_RGBA;
             }
-          else if (strcmp (name, "Xft/DPI") == 0)
+          else if (strcmp (name, "Xft/DPI") == 0 && ival != (CARD32) -1)
             {
               settings->seen |= SEEN_DPI;
-              settings->dpi = (double)ival/1024.0;
+              settings->dpi = ival / 1024.0;
             }
           else if (strcmp (name, "Xft/lcdfilter") == 0)
             {