Merge remote-tracking branch 'savannah/master' into HEAD

14 files changed, 222 insertions, 759 deletions

diff --git a/src/dired.c b/src/dired.c
index 1584b6acf08..8256f2626dc 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -293,7 +293,8 @@ DEFUN ("directory-files", Fdirectory_files, Sdirectory_files, 1, 4, 0,
 There are three optional arguments:
 If FULL is non-nil, return absolute file names.  Otherwise return names
  that are relative to the specified directory.
-If MATCH is non-nil, mention only file names that match the regexp MATCH.
+If MATCH is non-nil, mention only file names whose non-directory part
+ matches the regexp MATCH.
 If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
  Otherwise, the list returned is sorted with `string-lessp'.
  NOSORT is useful if you plan to sort the result yourself.  */)
@@ -325,11 +326,12 @@ by `file-attributes'.
 This function accepts four optional arguments:
 If FULL is non-nil, return absolute file names.  Otherwise return names
  that are relative to the specified directory.
-If MATCH is non-nil, mention only file names that match the regexp MATCH.
+If MATCH is non-nil, mention only file names whose non-directory part
+ matches the regexp MATCH.
 If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
  NOSORT is useful if you plan to sort the result yourself.
 ID-FORMAT specifies the preferred format of attributes uid and gid, see
-`file-attributes' for further documentation.
+ `file-attributes' for further documentation.
 On MS-Windows, performance depends on `w32-get-true-file-attributes',
 which see.  */)
   (Lisp_Object directory, Lisp_Object full, Lisp_Object match,
diff --git a/src/doc.c b/src/doc.c
index 8a4f885cc7e..d4e3ce2afea 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -420,7 +420,7 @@ string is passed through `substitute-command-keys'.  */)
     }
 
   if (NILP (raw))
-    doc = Fsubstitute_command_keys (doc);
+    doc = call1 (Qsubstitute_command_keys, doc);
   return doc;
 }
 
@@ -477,7 +477,7 @@ aren't strings.  */)
     tem = Feval (tem, Qnil);
 
   if (NILP (raw) && STRINGP (tem))
-    tem = Fsubstitute_command_keys (tem);
+    tem = call1 (Qsubstitute_command_keys, tem);
   return tem;
 }
 
@@ -702,315 +702,34 @@ text_quoting_style (void)
     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.
-Each substring of the form \\=\\[COMMAND] is replaced by either a
-keystroke sequence that invokes COMMAND, or "M-x COMMAND" if COMMAND
-is not on any keys.
-
-Each substring of the form \\=\\{MAPVAR} is replaced by a summary of
-the value of MAPVAR as a keymap.  This summary is similar to the one
-produced by `describe-bindings'.  The summary ends in two newlines
-\(used by the helper function `help-make-xrefs' to find the end of the
-summary).
-
-Each substring of the form \\=\\<MAPVAR> specifies the use of MAPVAR
-as the keymap for future \\=\\[COMMAND] substrings.
-
-Each grave accent \\=` is replaced by left quote, and each apostrophe \\='
-is replaced by right quote.  Left and right quote characters are
-specified by `text-quoting-style'.
-
-\\=\\= quotes the following character and is discarded; thus, \\=\\=\\=\\= puts \\=\\=
-into the output, \\=\\=\\=\\[ puts \\=\\[ into the output, and \\=\\=\\=` puts \\=` into the
-output.
-
-Return the original STRING if no substitutions are made.
-Otherwise, return a new string (without any text properties).  */)
-  (Lisp_Object string)
+/* This is just a Lisp wrapper for text_quoting_style above.  */
+DEFUN ("get-quoting-style", Fget_quoting_style,
+       Sget_quoting_style, 0, 0, 0,
+       doc: /* Return the current effective text quoting style.
+See variable `text-quoting-style'.  */)
+  (void)
 {
-  char *buf;
-  bool changed = false;
-  bool nonquotes_changed = false;
-  unsigned char *strp;
-  char *bufp;
-  ptrdiff_t idx;
-  ptrdiff_t bsize;
-  Lisp_Object tem;
-  Lisp_Object keymap;
-  unsigned char const *start;
-  ptrdiff_t length, length_byte;
-  Lisp_Object name;
-  ptrdiff_t nchars;
-
-  if (NILP (string))
-    return Qnil;
-
-  /* If STRING contains non-ASCII unibyte data, process its
-     properly-encoded multibyte equivalent instead.  This simplifies
-     the implementation and is OK since substitute-command-keys is
-     intended for use only on text strings.  Keep STRING around, since
-     it will be returned if no changes occur.  */
-  Lisp_Object str = Fstring_make_multibyte (string);
-
-  enum text_quoting_style quoting_style = text_quoting_style ();
-
-  nchars = 0;
-
-  /* KEYMAP is either nil (which means search all the active keymaps)
-     or a specified local map (which means search just that and the
-     global map).  If non-nil, it might come from Voverriding_local_map,
-     or from a \\<mapname> construct in STRING itself..  */
-  keymap = Voverriding_local_map;
-
-  ptrdiff_t strbytes = SBYTES (str);
-  bsize = strbytes;
-
-  /* Fixed-size stack buffer.  */
-  char sbuf[MAX_ALLOCA];
-
-  /* Heap-allocated buffer, if any.  */
-  char *abuf;
-
-  /* Extra room for expansion due to replacing ‘\[]’ with ‘M-x ’.  */
-  enum { EXTRA_ROOM = sizeof "M-x " - sizeof "\\[]" };
-
-  ptrdiff_t count = SPECPDL_INDEX ();
-
-  if (bsize <= sizeof sbuf - EXTRA_ROOM)
-    {
-      abuf = NULL;
-      buf = sbuf;
-      bsize = sizeof sbuf;
-    }
-  else
-    {
-      buf = abuf = xpalloc (NULL, &bsize, EXTRA_ROOM, STRING_BYTES_BOUND, 1);
-      record_unwind_protect_ptr (xfree, abuf);
-    }
-  bufp = buf;
-
-  strp = SDATA (str);
-  while (strp < SDATA (str) + strbytes)
-    {
-      unsigned char *close_bracket;
-
-      if (strp[0] == '\\' && strp[1] == '='
-          && strp + 2 < SDATA (str) + strbytes)
-        {
-          /* \= quotes the next character;
-             thus, to put in \[ without its special meaning, use \=\[.  */
-          changed = nonquotes_changed = true;
-          strp += 2;
-          /* Fall through to copy one char.  */
-        }
-      else if (strp[0] == '\\' && strp[1] == '['
-               && (close_bracket
-                   = memchr (strp + 2, ']',
-                             SDATA (str) + strbytes - (strp + 2))))
-        {
-          bool follow_remap = 1;
-
-          start = strp + 2;
-          length_byte = close_bracket - start;
-          idx = close_bracket + 1 - SDATA (str);
-
-          name = Fintern (make_string ((char *) start, length_byte), Qnil);
-
-        do_remap:
-          tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
-
-          if (VECTORP (tem) && ASIZE (tem) > 1
-              && EQ (AREF (tem, 0), Qremap) && SYMBOLP (AREF (tem, 1))
-              && follow_remap)
-            {
-              name = AREF (tem, 1);
-              follow_remap = 0;
-              goto do_remap;
-            }
-
-          /* Fwhere_is_internal can GC, so take relocation of string
-             contents into account.  */
-          strp = SDATA (str) + idx;
-          start = strp - length_byte - 1;
-
-          if (NILP (tem))       /* but not on any keys */
-            {
-              memcpy (bufp, "M-x ", 4);
-              bufp += 4;
-              nchars += 4;
-              length = multibyte_chars_in_text (start, length_byte);
-              goto subst;
-            }
-          else
-            {                   /* function is on a key */
-              tem = Fkey_description (tem, Qnil);
-              goto subst_string;
-            }
-        }
-      /* \{foo} is replaced with a summary of the keymap (symbol-value foo).
-         \<foo> just sets the keymap used for \[cmd].  */
-      else if (strp[0] == '\\' && (strp[1] == '{' || strp[1] == '<')
-               && (close_bracket
-                   = memchr (strp + 2, strp[1] == '{' ? '}' : '>',
-                             SDATA (str) + strbytes - (strp + 2))))
-        {
-         {
-          bool generate_summary = strp[1] == '{';
-          /* This is for computing the SHADOWS arg for describe_map_tree.  */
-          Lisp_Object active_maps = Fcurrent_active_maps (Qnil, Qnil);
-          ptrdiff_t count = SPECPDL_INDEX ();
-
-          start = strp + 2;
-          length_byte = close_bracket - start;
-          idx = close_bracket + 1 - SDATA (str);
-
-          /* Get the value of the keymap in TEM, or nil if undefined.
-             Do this while still in the user's current buffer
-             in case it is a local variable.  */
-          name = Fintern (make_string ((char *) start, length_byte), Qnil);
-          tem = Fboundp (name);
-          if (! NILP (tem))
-            {
-              tem = Fsymbol_value (name);
-              if (! NILP (tem))
-                tem = get_keymap (tem, 0, 1);
-            }
-
-          /* Now switch to a temp buffer.  */
-          struct buffer *oldbuf = current_buffer;
-          set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
-          /* This is for an unusual case where some after-change
-             function uses 'format' or 'prin1' or something else that
-             will thrash Vprin1_to_string_buffer we are using.  */
-          specbind (Qinhibit_modification_hooks, Qt);
-
-          if (NILP (tem))
-            {
-              name = Fsymbol_name (name);
-              AUTO_STRING (msg_prefix, "\nUses keymap `");
-              insert1 (Fsubstitute_command_keys (msg_prefix));
-              insert_from_string (name, 0, 0,
-                                  SCHARS (name),
-                                  SBYTES (name), 1);
-              AUTO_STRING (msg_suffix, "', which is not currently defined.\n");
-              insert1 (Fsubstitute_command_keys (msg_suffix));
-              if (!generate_summary)
-                keymap = Qnil;
-            }
-          else if (!generate_summary)
-            keymap = tem;
-          else
-            {
-              /* Get the list of active keymaps that precede this one.
-                 If this one's not active, get nil.  */
-              Lisp_Object earlier_maps
-                = Fcdr (Fmemq (tem, Freverse (active_maps)));
-              describe_map_tree (tem, 1, Fnreverse (earlier_maps),
-                                 Qnil, 0, 1, 0, 0, 1);
-            }
-          tem = Fbuffer_string ();
-          Ferase_buffer ();
-          set_buffer_internal (oldbuf);
-          unbind_to (count, Qnil);
-         }
-
-        subst_string:
-          /* Convert non-ASCII unibyte data to properly-encoded multibyte,
-             for the same reason STRING was converted to STR.  */
-          tem = Fstring_make_multibyte (tem);
-          start = SDATA (tem);
-          length = SCHARS (tem);
-          length_byte = SBYTES (tem);
-        subst:
-          nonquotes_changed = true;
-        subst_quote:
-          changed = true;
-          {
-            ptrdiff_t offset = bufp - buf;
-            ptrdiff_t avail = bsize - offset;
-            ptrdiff_t need = strbytes - idx;
-            if (INT_ADD_WRAPV (need, length_byte + EXTRA_ROOM, &need))
-              string_overflow ();
-            if (avail < need)
-              {
-                abuf = xpalloc (abuf, &bsize, need - avail,
-                                STRING_BYTES_BOUND, 1);
-                if (buf == sbuf)
-                  {
-                    record_unwind_protect_ptr (xfree, abuf);
-                    memcpy (abuf, sbuf, offset);
-                  }
-                else
-                  set_unwind_protect_ptr (count, xfree, abuf);
-                buf = abuf;
-                bufp = buf + offset;
-              }
-            memcpy (bufp, start, length_byte);
-            bufp += length_byte;
-            nchars += length;
-
-            /* Some of the previous code can GC, so take relocation of
-               string contents into account.  */
-            strp = SDATA (str) + idx;
-
-            continue;
-          }
-        }
-      else if ((strp[0] == '`' || strp[0] == '\'')
-               && quoting_style == CURVE_QUOTING_STYLE)
-        {
-          start = (unsigned char const *) (strp[0] == '`' ? uLSQM : uRSQM);
-          length = 1;
-          length_byte = sizeof uLSQM - 1;
-          idx = strp - SDATA (str) + 1;
-          goto subst_quote;
-        }
-      else if (strp[0] == '`' && quoting_style == STRAIGHT_QUOTING_STYLE)
-        {
-          *bufp++ = '\'';
-          strp++;
-          nchars++;
-          changed = true;
-          continue;
-        }
-
-      /* Copy one char.  */
-      do
-        *bufp++ = *strp++;
-      while (! CHAR_HEAD_P (*strp));
-      nchars++;
-    }
-
-  if (changed)                  /* don't bother if nothing substituted */
+  switch (text_quoting_style ())
     {
-      tem = make_string_from_bytes (buf, nchars, bufp - buf);
-      if (!nonquotes_changed)
-        {
-          /* Nothing has changed other than quoting, so copy the string’s
-             text properties.  FIXME: Text properties should survive other
-             changes too; see bug#17052.  */
-          INTERVAL interval_copy = copy_intervals (string_intervals (string),
-                                                   0, SCHARS (string));
-          if (interval_copy)
-            {
-              set_interval_object (interval_copy, tem);
-              set_string_intervals (tem, interval_copy);
-            }
-        }
+    case STRAIGHT_QUOTING_STYLE:
+      return Qstraight;
+    case CURVE_QUOTING_STYLE:
+      return Qcurve;
+    case GRAVE_QUOTING_STYLE:
+    default:
+      return Qgrave;
     }
-  else
-    tem = string;
-  return unbind_to (count, tem);
 }
+
 
 void
 syms_of_doc (void)
 {
+  DEFSYM (Qsubstitute_command_keys, "substitute-command-keys");
   DEFSYM (Qfunction_documentation, "function-documentation");
   DEFSYM (Qgrave, "grave");
   DEFSYM (Qstraight, "straight");
+  DEFSYM (Qcurve, "curve");
 
   DEFVAR_LISP ("internal-doc-file-name", Vdoc_file_name,
                doc: /* Name of file containing documentation strings of built-in symbols.  */);
@@ -1042,5 +761,5 @@ otherwise.  */);
   defsubr (&Sdocumentation);
   defsubr (&Sdocumentation_property);
   defsubr (&Ssnarf_documentation);
-  defsubr (&Ssubstitute_command_keys);
+  defsubr (&Sget_quoting_style);
 }
diff --git a/src/eval.c b/src/eval.c
index 84631f4f942..09e12bd3752 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -553,7 +553,10 @@ usage: (quote ARG)  */)
 DEFUN ("function", Ffunction, Sfunction, 1, UNEVALLED, 0,
        doc: /* Like `quote', but preferred for objects which are functions.
 In byte compilation, `function' causes its argument to be handled by
-the byte compiler.  `quote' cannot do that.
+the byte compiler.  Similarly, when expanding macros and expressions,
+ARG can be examined and possibly expanded.  If `quote' is used
+instead, this doesn't happen.
+
 usage: (function ARG)  */)
   (Lisp_Object args)
 {
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 4892a34a3ab..a10308c62ee 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -139,7 +139,8 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
 
   FcPatternDestroy (pat);
   font_face = cairo_ft_font_face_create_for_pattern (match);
-  if (!font_face)
+  if (!font_face
+      || cairo_font_face_status (font_face) != CAIRO_STATUS_SUCCESS)
     {
       unblock_input ();
       FcPatternDestroy (match);
@@ -154,6 +155,18 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
   cairo_font_face_destroy (font_face);
   cairo_font_options_destroy (options);
   unblock_input ();
+  if (!scaled_font
+      || cairo_scaled_font_status (scaled_font) != CAIRO_STATUS_SUCCESS)
+    {
+      FcPatternDestroy (match);
+      return Qnil;
+    }
+  ft_face = cairo_ft_scaled_font_lock_face (scaled_font);
+  if (!ft_face)
+    {
+      FcPatternDestroy (match);
+      return Qnil;
+    }
 
   font_object = font_build_object (VECSIZE (struct font_info),
                                    AREF (entity, FONT_TYPE_INDEX),
@@ -234,7 +247,6 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
       font->descent = font->height - font->ascent;
     }
 
-  ft_face = cairo_ft_scaled_font_lock_face (scaled_font);
   if (XFIXNUM (AREF (entity, FONT_SIZE_INDEX)) == 0)
     {
       int upEM = ft_face->units_per_EM;
diff --git a/src/image.c b/src/image.c
index 25d5af8a8d5..5f6d9f4c443 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9736,7 +9736,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
                 ptrdiff_t size, char *filename)
 {
   RsvgHandle *rsvg_handle;
-  RsvgDimensionData dimension_data;
+  double viewbox_width, viewbox_height;
   GError *err = NULL;
   GdkPixbuf *pixbuf;
   int width;
@@ -9789,15 +9789,38 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
 #endif
 
   /* Get the image dimensions.  */
+#if LIBRSVG_CHECK_VERSION (2, 46, 0)
+  RsvgRectangle zero_rect, viewbox;
+
+  rsvg_handle_get_geometry_for_layer (rsvg_handle, NULL,
+                                      &zero_rect, &viewbox,
+                                      NULL, NULL);
+  viewbox_width = viewbox.x + viewbox.width;
+  viewbox_height = viewbox.y + viewbox.height;
+#else
+  /* The function used above to get the geometry of the visible area
+     of the SVG are only available in librsvg 2.46 and above, so in
+     certain circumstances this code path can result in some parts of
+     the SVG being cropped.  */
+  RsvgDimensionData dimension_data;
+
   rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
 
+  viewbox_width = dimension_data.width;
+  viewbox_height = dimension_data.height;
+#endif
+  compute_image_size (viewbox_width, viewbox_height, img->spec,
+                      &width, &height);
+
+  if (! check_image_size (f, width, height))
+    {
+      image_size_error ();
+      goto rsvg_error;
+    }
+
   /* We are now done with the unmodified data.  */
   g_object_unref (rsvg_handle);
 
-  /* Calculate the final image size.  */
-  compute_image_size (dimension_data.width, dimension_data.height,
-                      img->spec, &width, &height);
-
   /* Wrap the SVG data in another SVG.  This allows us to set the
      width and height, as well as modify the foreground and background
      colors.  */
@@ -9820,7 +9843,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
       "xmlns:xi=\"http://www.w3.org/2001/XInclude\" "
       "style=\"color: #%06X; fill: currentColor;\" "
       "width=\"%d\" height=\"%d\" preserveAspectRatio=\"none\" "
-      "viewBox=\"0 0 %d %d\">"
+      "viewBox=\"0 0 %f %f\">"
       "<rect width=\"100%%\" height=\"100%%\" fill=\"#%06X\"/>"
       "<xi:include href=\"data:image/svg+xml;base64,%s\"></xi:include>"
       "</svg>";
@@ -9845,8 +9868,9 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
     if (!wrapped_contents
         || buffer_size <= snprintf (wrapped_contents, buffer_size, wrapper,
                                     foreground & 0xFFFFFF, width, height,
-                                    dimension_data.width, dimension_data.height,
-                                    background & 0xFFFFFF, SSDATA (encoded_contents)))
+                                    viewbox_width, viewbox_height,
+                                    background & 0xFFFFFF,
+                                    SSDATA (encoded_contents)))
       goto rsvg_error;
 
     wrapped_size = strlen (wrapped_contents);
@@ -9887,12 +9911,6 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
   if (err) goto rsvg_error;
 #endif
 
-  rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
-  if (! check_image_size (f, dimension_data.width, dimension_data.height))
-    {
-      image_size_error ();
-      goto rsvg_error;
-    }
 
   /* We can now get a valid pixel buffer from the svg file, if all
      went ok.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index 4d22c44810e..2e0143379a0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2040,7 +2040,7 @@ help_echo_substitute_command_keys (Lisp_Object help)
                                     help)))
     return help;
 
-  return Fsubstitute_command_keys (help);
+  return call1 (Qsubstitute_command_keys, help);
 }
 
 /* Display the help-echo property of the character after the mouse pointer.
@@ -5254,7 +5254,6 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
                                         extra_info)));
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
   else if (f)
     {
       /* Return mouse pixel coordinates here.  */
@@ -5262,7 +5261,9 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
       xret = XFIXNUM (x);
       yret = XFIXNUM (y);
 
-      if (FRAME_LIVE_P (f)
+#ifdef HAVE_WINDOW_SYSTEM
+      if (FRAME_WINDOW_P (f)
+          && FRAME_LIVE_P (f)
           && FRAME_INTERNAL_BORDER_WIDTH (f) > 0
           && !NILP (get_frame_param (f, Qdrag_internal_border)))
         {
@@ -5271,8 +5272,8 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
 
           posn = builtin_lisp_symbol (internal_border_parts[part]);
         }
-    }
 #endif
+    }
 
   else
     window_or_frame = Qnil;
@@ -7855,7 +7856,7 @@ parse_menu_item (Lisp_Object item, int inmenubar)
     /* The previous code preferred :key-sequence to :keys, so we
        preserve this behavior.  */
     if (STRINGP (keyeq) && !CONSP (keyhint))
-      keyeq = concat2 (space_space, Fsubstitute_command_keys (keyeq));
+      keyeq = concat2 (space_space, call1 (Qsubstitute_command_keys, keyeq));
     else
       {
         Lisp_Object prefix = keyeq;
diff --git a/src/keymap.c b/src/keymap.c
index 0608bdddeea..e5b4781076f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -89,11 +89,6 @@ static Lisp_Object where_is_cache_keymaps;
 static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object);
 
 static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object);
-static void describe_command (Lisp_Object, Lisp_Object);
-static void describe_translation (Lisp_Object, Lisp_Object);
-static void describe_map (Lisp_Object, Lisp_Object,
-                          void (*) (Lisp_Object, Lisp_Object),
-                          bool, Lisp_Object, Lisp_Object *, bool, bool);
 static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
                              void (*) (Lisp_Object, Lisp_Object), bool,
                              Lisp_Object, Lisp_Object, bool, bool);
@@ -679,6 +674,23 @@ usage: (map-keymap FUNCTION KEYMAP)  */)
   return Qnil;
 }
 
+DEFUN ("keymap--get-keyelt", Fkeymap__get_keyelt, Skeymap__get_keyelt, 2, 2, 0,
+       doc: /* Given OBJECT which was found in a slot in a keymap,
+trace indirect definitions to get the actual definition of that slot.
+An indirect definition is a list of the form
+(KEYMAP . INDEX), where KEYMAP is a keymap or a symbol defined as one
+and INDEX is the object to look up in KEYMAP to yield the definition.
+
+Also if OBJECT has a menu string as the first element,
+remove that.  Also remove a menu help string as second element.
+
+If AUTOLOAD, load autoloadable keymaps
+that are referred to with indirection.  */)
+  (Lisp_Object object, Lisp_Object autoload)
+{
+  return get_keyelt (object, NILP (autoload) ? false : true);
+}
+
 /* Given OBJECT which was found in a slot in a keymap,
    trace indirect definitions to get the actual definition of that slot.
    An indirect definition is a list of the form
@@ -2733,7 +2745,7 @@ The optional argument MENUS, if non-nil, says to mention menu bindings.
   (Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus)
 {
   Lisp_Object outbuf, shadow;
-  bool nomenu = NILP (menus);
+  Lisp_Object nomenu = NILP (menus) ? Qt : Qnil;
   Lisp_Object start1;
 
   const char *alternate_heading
@@ -2782,9 +2794,13 @@ You type        Translation\n\
     }
 
   if (!NILP (Vkey_translation_map))
-    describe_map_tree (Vkey_translation_map, 0, Qnil, prefix,
-                       "Key translations", nomenu, 1, 0, 0);
-
+    {
+      Lisp_Object msg = build_unibyte_string ("Key translations");
+      CALLN (Ffuncall,
+             Qdescribe_map_tree,
+             Vkey_translation_map, Qnil, Qnil, prefix,
+             msg, nomenu, Qt, Qnil, Qnil);
+    }
 
   /* Print the (major mode) local map.  */
   start1 = Qnil;
@@ -2793,8 +2809,11 @@ You type        Translation\n\
 
   if (!NILP (start1))
     {
-      describe_map_tree (start1, 1, shadow, prefix,
-                         "\f\nOverriding Bindings", nomenu, 0, 0, 0);
+      Lisp_Object msg = build_unibyte_string ("\f\nOverriding Bindings");
+      CALLN (Ffuncall,
+             Qdescribe_map_tree,
+             start1, Qt, shadow, prefix,
+             msg, nomenu, Qnil, Qnil, Qnil);
       shadow = Fcons (start1, shadow);
       start1 = Qnil;
     }
@@ -2803,8 +2822,11 @@ You type        Translation\n\
 
   if (!NILP (start1))
     {
-      describe_map_tree (start1, 1, shadow, prefix,
-                         "\f\nOverriding Bindings", nomenu, 0, 0, 0);
+      Lisp_Object msg = build_unibyte_string ("\f\nOverriding Bindings");
+      CALLN (Ffuncall,
+             Qdescribe_map_tree,
+             start1, Qt, shadow, prefix,
+             msg, nomenu, Qnil, Qnil, Qnil);
       shadow = Fcons (start1, shadow);
     }
   else
@@ -2824,9 +2846,11 @@ You type        Translation\n\
                               XBUFFER (buffer), Qkeymap);
       if (!NILP (start1))
         {
-          describe_map_tree (start1, 1, shadow, prefix,
-                             "\f\n`keymap' Property Bindings", nomenu,
-                             0, 0, 0);
+          Lisp_Object msg = build_unibyte_string ("\f\n`keymap' Property Bindings");
+          CALLN (Ffuncall,
+                 Qdescribe_map_tree,
+                 start1, Qt, shadow, prefix,
+                 msg, nomenu, Qnil, Qnil, Qnil);
           shadow = Fcons (start1, shadow);
         }
 
@@ -2835,7 +2859,7 @@ You type        Translation\n\
         {
           /* The title for a minor mode keymap
              is constructed at run time.
-             We let describe_map_tree do the actual insertion
+             We let describe-map-tree do the actual insertion
              because it takes care of other features when doing so.  */
           char *title, *p;
 
@@ -2855,8 +2879,11 @@ You type        Translation\n\
           p += strlen (" Minor Mode Bindings");
           *p = 0;
 
-          describe_map_tree (maps[i], 1, shadow, prefix,
-                             title, nomenu, 0, 0, 0);
+          Lisp_Object msg = build_unibyte_string (title);
+          CALLN (Ffuncall,
+                 Qdescribe_map_tree,
+                 maps[i], Qt, shadow, prefix,
+                 msg, nomenu, Qnil, Qnil, Qnil);
           shadow = Fcons (maps[i], shadow);
           SAFE_FREE ();
         }
@@ -2866,432 +2893,66 @@ You type        Translation\n\
       if (!NILP (start1))
         {
           if (EQ (start1, BVAR (XBUFFER (buffer), keymap)))
-            describe_map_tree (start1, 1, shadow, prefix,
-                               "\f\nMajor Mode Bindings", nomenu, 0, 0, 0);
-          else
-            describe_map_tree (start1, 1, shadow, prefix,
-                               "\f\n`local-map' Property Bindings",
-                               nomenu, 0, 0, 0);
-
-          shadow = Fcons (start1, shadow);
-        }
-    }
-
-  describe_map_tree (current_global_map, 1, shadow, prefix,
-                     "\f\nGlobal Bindings", nomenu, 0, 1, 0);
-
-  /* Print the function-key-map translations under this prefix.  */
-  if (!NILP (KVAR (current_kboard, Vlocal_function_key_map)))
-    describe_map_tree (KVAR (current_kboard, Vlocal_function_key_map), 0, Qnil, prefix,
-                       "\f\nFunction key map translations", nomenu, 1, 0, 0);
-
-  /* Print the input-decode-map translations under this prefix.  */
-  if (!NILP (KVAR (current_kboard, Vinput_decode_map)))
-    describe_map_tree (KVAR (current_kboard, Vinput_decode_map), 0, Qnil, prefix,
-                       "\f\nInput decoding map translations", nomenu, 1, 0, 0);
-
-  return Qnil;
-}
-
-/* Insert a description of the key bindings in STARTMAP,
-    followed by those of all maps reachable through STARTMAP.
-   If PARTIAL, omit certain "uninteresting" commands
-    (such as `undefined').
-   If SHADOW is non-nil, it is a list of maps;
-    don't mention keys which would be shadowed by any of them.
-   PREFIX, if non-nil, says mention only keys that start with PREFIX.
-   TITLE, if not 0, is a string to insert at the beginning.
-   TITLE should not end with a colon or a newline; we supply that.
-   If NOMENU, then omit menu-bar commands.
-
-   If TRANSL, the definitions are actually key translations
-   so print strings and vectors differently.
-
-   If ALWAYS_TITLE, print the title even if there are no maps
-   to look through.
-
-   If MENTION_SHADOW, then when something is shadowed by SHADOW,
-   don't omit it; instead, mention it but say it is shadowed.
-
-   Any inserted text ends in two newlines (used by `help-make-xrefs').  */
-
-void
-describe_map_tree (Lisp_Object startmap, bool partial, Lisp_Object shadow,
-                   Lisp_Object prefix, const char *title, bool nomenu,
-                   bool transl, bool always_title, bool mention_shadow)
-{
-  Lisp_Object maps, orig_maps, seen, sub_shadows;
-  bool something = 0;
-  const char *key_heading
-    = "\
-key             binding\n\
----             -------\n";
-
-  orig_maps = maps = Faccessible_keymaps (startmap, prefix);
-  seen = Qnil;
-  sub_shadows = Qnil;
-
-  if (nomenu)
-    {
-      Lisp_Object list;
-
-      /* Delete from MAPS each element that is for the menu bar.  */
-      for (list = maps; CONSP (list); list = XCDR (list))
-        {
-          Lisp_Object elt, elt_prefix, tem;
-
-          elt = XCAR (list);
-          elt_prefix = Fcar (elt);
-          if (ASIZE (elt_prefix) >= 1)
             {
-              tem = Faref (elt_prefix, make_fixnum (0));
-              if (EQ (tem, Qmenu_bar))
-                maps = Fdelq (elt, maps);
+              Lisp_Object msg = build_unibyte_string ("\f\nMajor Mode Bindings");
+              CALLN (Ffuncall,
+                     Qdescribe_map_tree,
+                     start1, Qt, shadow, prefix,
+                     msg, nomenu, Qnil, Qnil, Qnil);
             }
-        }
-    }
-
-  if (!NILP (maps) || always_title)
-    {
-      if (title)
-        {
-          insert_string (title);
-          if (!NILP (prefix))
+          else
             {
-              insert_string (" Starting With ");
-              insert1 (Fkey_description (prefix, Qnil));
+              Lisp_Object msg = build_unibyte_string ("\f\n`local-map' Property Bindings");
+              CALLN (Ffuncall,
+                     Qdescribe_map_tree,
+                     start1, Qt, shadow, prefix,
+                     msg, nomenu, Qnil, Qnil, Qnil);
             }
-          insert_string (":\n");
-        }
-      insert_string (key_heading);
-      something = 1;
-    }
 
-  for (; CONSP (maps); maps = XCDR (maps))
-    {
-      register Lisp_Object elt, elt_prefix, tail;
-
-      elt = XCAR (maps);
-      elt_prefix = Fcar (elt);
-
-      sub_shadows = Flookup_key (shadow, elt_prefix, Qt);
-      if (FIXNATP (sub_shadows))
-        sub_shadows = Qnil;
-      else if (!KEYMAPP (sub_shadows)
-               && !NILP (sub_shadows)
-               && !(CONSP (sub_shadows)
-                    && KEYMAPP (XCAR (sub_shadows))))
-          /* If elt_prefix is bound to something that's not a keymap,
-             it completely shadows this map, so don't
-             describe this map at all.  */
-        goto skip;
-
-      /* Maps we have already listed in this loop shadow this map.  */
-      for (tail = orig_maps; !EQ (tail, maps); tail = XCDR (tail))
-        {
-          Lisp_Object tem;
-          tem = Fequal (Fcar (XCAR (tail)), elt_prefix);
-          if (!NILP (tem))
-            sub_shadows = Fcons (XCDR (XCAR (tail)), sub_shadows);
+          shadow = Fcons (start1, shadow);
         }
-
-      describe_map (Fcdr (elt), elt_prefix,
-                    transl ? describe_translation : describe_command,
-                    partial, sub_shadows, &seen, nomenu, mention_shadow);
-
-    skip: ;
     }
 
-  if (something)
-    insert_string ("\n");
-}
-
-static int previous_description_column;
-
-static void
-describe_command (Lisp_Object definition, Lisp_Object args)
-{
-  register Lisp_Object tem1;
-  ptrdiff_t column = current_column ();
-  int description_column;
+  Lisp_Object msg = build_unibyte_string ("\f\nGlobal Bindings");
+  CALLN (Ffuncall,
+         Qdescribe_map_tree,
+         current_global_map, Qt, shadow, prefix,
+         msg, nomenu, Qnil, Qt, Qnil);
 
-  /* If column 16 is no good, go to col 32;
-     but don't push beyond that--go to next line instead.  */
-  if (column > 30)
+  /* Print the function-key-map translations under this prefix.  */
+  if (!NILP (KVAR (current_kboard, Vlocal_function_key_map)))
     {
-      insert_char ('\n');
-      description_column = 32;
+      Lisp_Object msg = build_unibyte_string ("\f\nFunction key map translations");
+      CALLN (Ffuncall,
+             Qdescribe_map_tree,
+             KVAR (current_kboard, Vlocal_function_key_map), Qnil, Qnil, prefix,
+             msg, nomenu, Qt, Qt, Qt);
     }
-  else if (column > 14 || (column > 10 && previous_description_column == 32))
-    description_column = 32;
-  else
-    description_column = 16;
-
-  Findent_to (make_fixnum (description_column), make_fixnum (1));
-  previous_description_column = description_column;
 
-  if (SYMBOLP (definition))
+  /* Print the input-decode-map translations under this prefix.  */
+  if (!NILP (KVAR (current_kboard, Vinput_decode_map)))
     {
-      tem1 = SYMBOL_NAME (definition);
-      insert1 (tem1);
-      insert_string ("\n");
+      Lisp_Object msg = build_unibyte_string ("\f\nInput decoding map translations");
+      CALLN (Ffuncall,
+             Qdescribe_map_tree,
+             KVAR (current_kboard, Vinput_decode_map), Qnil, Qnil, prefix,
+             msg, nomenu, Qt, Qnil, Qnil);
     }
-  else if (STRINGP (definition) || VECTORP (definition))
-    insert_string ("Keyboard Macro\n");
-  else if (KEYMAPP (definition))
-    insert_string ("Prefix Command\n");
-  else
-    insert_string ("??\n");
+  return Qnil;
 }
 
 static void
-describe_translation (Lisp_Object definition, Lisp_Object args)
+describe_vector_princ (Lisp_Object elt, Lisp_Object fun)
 {
-  register Lisp_Object tem1;
-
   Findent_to (make_fixnum (16), make_fixnum (1));
-
-  if (SYMBOLP (definition))
-    {
-      tem1 = SYMBOL_NAME (definition);
-      insert1 (tem1);
-      insert_string ("\n");
-    }
-  else if (STRINGP (definition) || VECTORP (definition))
-    {
-      insert1 (Fkey_description (definition, Qnil));
-      insert_string ("\n");
-    }
-  else if (KEYMAPP (definition))
-    insert_string ("Prefix Command\n");
-  else
-    insert_string ("??\n");
-}
-
-/* describe_map puts all the usable elements of a sparse keymap
-   into an array of `struct describe_map_elt',
-   then sorts them by the events.  */
-
-struct describe_map_elt
-{
-  Lisp_Object event;
-  Lisp_Object definition;
-  bool shadowed;
-};
-
-/* qsort comparison function for sorting `struct describe_map_elt' by
-   the event field.  */
-
-static int
-describe_map_compare (const void *aa, const void *bb)
-{
-  const struct describe_map_elt *a = aa, *b = bb;
-  if (FIXNUMP (a->event) && FIXNUMP (b->event))
-    return ((XFIXNUM (a->event) > XFIXNUM (b->event))
-            - (XFIXNUM (a->event) < XFIXNUM (b->event)));
-  if (!FIXNUMP (a->event) && FIXNUMP (b->event))
-    return 1;
-  if (FIXNUMP (a->event) && !FIXNUMP (b->event))
-    return -1;
-  if (SYMBOLP (a->event) && SYMBOLP (b->event))
-    /* Sort the keystroke names in the "natural" way, with (for
-       instance) "<f2>" coming between "<f1>" and "<f11>".  */
-    return string_version_cmp (SYMBOL_NAME (a->event), SYMBOL_NAME (b->event));
-  return 0;
-}
-
-/* Describe the contents of map MAP, assuming that this map itself is
-   reached by the sequence of prefix keys PREFIX (a string or vector).
-   PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above.  */
-
-static void
-describe_map (Lisp_Object map, Lisp_Object prefix,
-              void (*elt_describer) (Lisp_Object, Lisp_Object),
-              bool partial, Lisp_Object shadow,
-              Lisp_Object *seen, bool nomenu, bool mention_shadow)
-{
-  Lisp_Object tail, definition, event;
-  Lisp_Object tem;
-  Lisp_Object suppress;
-  Lisp_Object kludge;
-  bool first = 1;
-
-  /* These accumulate the values from sparse keymap bindings,
-     so we can sort them and handle them in order.  */
-  ptrdiff_t length_needed = 0;
-  struct describe_map_elt *vect;
-  ptrdiff_t slots_used = 0;
-  ptrdiff_t i;
-
-  suppress = Qnil;
-
-  if (partial)
-    suppress = intern ("suppress-keymap");
-
-  /* This vector gets used to present single keys to Flookup_key.  Since
-     that is done once per keymap element, we don't want to cons up a
-     fresh vector every time.  */
-  kludge = make_nil_vector (1);
-  definition = Qnil;
-
-  map = call1 (Qkeymap_canonicalize, map);
-
-  for (tail = map; CONSP (tail); tail = XCDR (tail))
-    length_needed++;
-
-  USE_SAFE_ALLOCA;
-  SAFE_NALLOCA (vect, 1, length_needed);
-
-  for (tail = map; CONSP (tail); tail = XCDR (tail))
-    {
-      maybe_quit ();
-
-      if (VECTORP (XCAR (tail))
-          || CHAR_TABLE_P (XCAR (tail)))
-        describe_vector (XCAR (tail),
-                         prefix, Qnil, elt_describer, partial, shadow, map,
-                         1, mention_shadow);
-      else if (CONSP (XCAR (tail)))
-        {
-          bool this_shadowed = 0;
-
-          event = XCAR (XCAR (tail));
-
-          /* Ignore bindings whose "prefix" are not really valid events.
-             (We get these in the frames and buffers menu.)  */
-          if (!(SYMBOLP (event) || FIXNUMP (event)))
-            continue;
-
-          if (nomenu && EQ (event, Qmenu_bar))
-            continue;
-
-          definition = get_keyelt (XCDR (XCAR (tail)), 0);
-
-          /* Don't show undefined commands or suppressed commands.  */
-          if (NILP (definition)) continue;
-          if (SYMBOLP (definition) && partial)
-            {
-              tem = Fget (definition, suppress);
-              if (!NILP (tem))
-                continue;
-            }
-
-          /* Don't show a command that isn't really visible
-             because a local definition of the same key shadows it.  */
-
-          ASET (kludge, 0, event);
-          if (!NILP (shadow))
-            {
-              tem = shadow_lookup (shadow, kludge, Qt, 0);
-              if (!NILP (tem))
-                {
-                  /* If both bindings are keymaps, this key is a prefix key,
-                     so don't say it is shadowed.  */
-                  if (KEYMAPP (definition) && KEYMAPP (tem))
-                    ;
-                  /* Avoid generating duplicate entries if the
-                     shadowed binding has the same definition.  */
-                  else if (mention_shadow && !EQ (tem, definition))
-                    this_shadowed = 1;
-                  else
-                    continue;
-                }
-            }
-
-          tem = Flookup_key (map, kludge, Qt);
-          if (!EQ (tem, definition)) continue;
-
-          vect[slots_used].event = event;
-          vect[slots_used].definition = definition;
-          vect[slots_used].shadowed = this_shadowed;
-          slots_used++;
-        }
-      else if (EQ (XCAR (tail), Qkeymap))
-        {
-          /* The same keymap might be in the structure twice, if we're
-             using an inherited keymap.  So skip anything we've already
-             encountered.  */
-          tem = Fassq (tail, *seen);
-          if (CONSP (tem) && !NILP (Fequal (XCAR (tem), prefix)))
-            break;
-          *seen = Fcons (Fcons (tail, prefix), *seen);
-        }
-    }
-
-  /* If we found some sparse map events, sort them.  */
-
-  qsort (vect, slots_used, sizeof (struct describe_map_elt),
-         describe_map_compare);
-
-  /* Now output them in sorted order.  */
-
-  for (i = 0; i < slots_used; i++)
-    {
-      Lisp_Object start, end;
-
-      if (first)
-        {
-          previous_description_column = 0;
-          insert ("\n", 1);
-          first = 0;
-        }
-
-      ASET (kludge, 0, vect[i].event);
-      start = vect[i].event;
-      end = start;
-
-      definition = vect[i].definition;
-
-      /* Find consecutive chars that are identically defined.  */
-      if (FIXNUMP (vect[i].event))
-        {
-          while (i + 1 < slots_used
-                 && EQ (vect[i+1].event, make_fixnum (XFIXNUM (vect[i].event) + 1))
-                 && !NILP (Fequal (vect[i + 1].definition, definition))
-                 && vect[i].shadowed == vect[i + 1].shadowed)
-            i++;
-          end = vect[i].event;
-        }
-
-      /* Now START .. END is the range to describe next.  */
-
-      /* Insert the string to describe the event START.  */
-      insert1 (Fkey_description (kludge, prefix));
-
-      if (!EQ (start, end))
-        {
-          insert (" .. ", 4);
-
-          ASET (kludge, 0, end);
-          /* Insert the string to describe the character END.  */
-          insert1 (Fkey_description (kludge, prefix));
-        }
-
-      /* Print a description of the definition of this character.
-         elt_describer will take care of spacing out far enough
-         for alignment purposes.  */
-      (*elt_describer) (vect[i].definition, Qnil);
-
-      if (vect[i].shadowed)
-        {
-          ptrdiff_t pt = max (PT - 1, BEG);
-
-          SET_PT (pt);
-          insert_string ("\n  (this binding is currently shadowed)");
-          pt = min (PT + 1, Z);
-          SET_PT (pt);
-        }
-    }
-
-  SAFE_FREE ();
+  call1 (fun, elt);
+  Fterpri (Qnil, Qnil);
 }
 
 static void
-describe_vector_princ (Lisp_Object elt, Lisp_Object fun)
+describe_vector_basic (Lisp_Object elt, Lisp_Object fun)
 {
-  Findent_to (make_fixnum (16), make_fixnum (1));
   call1 (fun, elt);
-  Fterpri (Qnil, Qnil);
 }
 
 DEFUN ("describe-vector", Fdescribe_vector, Sdescribe_vector, 1, 2, 0,
@@ -3311,8 +2972,40 @@ DESCRIBER is the output function used; nil means use `princ'.  */)
   return unbind_to (count, Qnil);
 }
 
+DEFUN ("help--describe-vector", Fhelp__describe_vector, Shelp__describe_vector, 7, 7, 0,
+       doc: /* Insert in the current buffer a description of the contents of VECTOR.
+Call DESCRIBER to insert the description of one value found in VECTOR.
+
+PREFIX is a string describing the key which leads to the keymap that
+this vector is in.
+
+If PARTIAL, it means do not mention suppressed commands.
+
+SHADOW is a list of keymaps that shadow this map.
+If it is non-nil, look up the key in those maps and don't mention it
+if it is defined by any of them.
+
+ENTIRE-MAP is the keymap in which this vector appears.
+If the definition in effect in the whole map does not match
+the one in this keymap, we ignore this one.  */)
+  (Lisp_Object vector, Lisp_Object prefix, Lisp_Object describer,
+   Lisp_Object partial, Lisp_Object shadow, Lisp_Object entire_map,
+   Lisp_Object mention_shadow)
+{
+  ptrdiff_t count = SPECPDL_INDEX ();
+  specbind (Qstandard_output, Fcurrent_buffer ());
+  CHECK_VECTOR_OR_CHAR_TABLE (vector);
+
+  bool b_partial = NILP (partial) ? false : true;
+  bool b_mention_shadow = NILP (mention_shadow) ? false : true;
+
+  describe_vector (vector, prefix, describer, describe_vector_basic, b_partial,
+                   shadow, entire_map, true, b_mention_shadow);
+  return unbind_to (count, Qnil);
+}
+
 /* Insert in the current buffer a description of the contents of VECTOR.
-   We call ELT_DESCRIBER to insert the description of one value found
+   Call ELT_DESCRIBER to insert the description of one value found
    in VECTOR.
 
    ELT_PREFIX describes what "comes before" the keys or indices defined
@@ -3568,6 +3261,7 @@ void
 syms_of_keymap (void)
 {
   DEFSYM (Qkeymap, "keymap");
+  DEFSYM (Qdescribe_map_tree, "describe-map-tree");
   staticpro (&apropos_predicate);
   staticpro (&apropos_accumulate);
   apropos_predicate = Qnil;
@@ -3708,6 +3402,8 @@ be preferred.  */);
   defsubr (&Scurrent_active_maps);
   defsubr (&Saccessible_keymaps);
   defsubr (&Skey_description);
+  defsubr (&Skeymap__get_keyelt);
+  defsubr (&Shelp__describe_vector);
   defsubr (&Sdescribe_vector);
   defsubr (&Ssingle_key_description);
   defsubr (&Stext_char_description);
diff --git a/src/keymap.h b/src/keymap.h
index 3ef48fb748e..2f7df2bd955 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -36,8 +36,6 @@ extern Lisp_Object current_global_map;
 extern char *push_key_description (EMACS_INT, char *);
 extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, bool, bool, bool);
 extern Lisp_Object get_keymap (Lisp_Object, bool, bool);
-extern void describe_map_tree (Lisp_Object, bool, Lisp_Object, Lisp_Object,
-                               const char *, bool, bool, bool, bool);
 extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **);
 extern void initial_define_key (Lisp_Object, int, const char *);
 extern void initial_define_lispy_key (Lisp_Object, const char *, const char *);
diff --git a/src/lread.c b/src/lread.c
index 6aab470eb2f..015bcc2e11b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2667,6 +2667,13 @@ read_escape (Lisp_Object readcharfun, bool stringp)
         while (++count <= unicode_hex_count)
           {
             c = READCHAR;
+            if (c < 0)
+              {
+                if (unicode_hex_count > 4)
+                  error ("Malformed Unicode escape: \\U%x", i);
+                else
+                  error ("Malformed Unicode escape: \\u%x", i);
+              }
             /* `isdigit' and `isalpha' may be locale-specific, which we don't
                want.  */
             int digit = char_hexdigit (c);
diff --git a/src/nsterm.m b/src/nsterm.m
index a702a051d00..fa38350a2f6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3048,6 +3048,12 @@ ns_clear_under_internal_border (struct frame *f)
       if (!face)
         face = FRAME_DEFAULT_FACE (f);
 
+      /* Sometimes with new frames we reach this point and have no
+         face.  I'm not sure why we have a live frame but no face, so
+         just give up.  */
+      if (!face)
+        return;
+
       ns_focus (f, &frame_rect, 1);
       [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
       for (int i = 0; i < 4 ; i++)
diff --git a/src/print.c b/src/print.c
index 23d0625792c..9d839d6ba66 100644
--- a/src/print.c
+++ b/src/print.c
@@ -941,7 +941,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context,
   else
     {
       Lisp_Object error_conditions = Fget (errname, Qerror_conditions);
-      errmsg = Fsubstitute_command_keys (Fget (errname, Qerror_message));
+      errmsg = call1 (Qsubstitute_command_keys, Fget (errname, Qerror_message));
       file_error = Fmemq (Qfile_error, error_conditions);
     }
 
diff --git a/src/search.c b/src/search.c
index 6fb3716cd43..e7f90949464 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2748,7 +2748,7 @@ since only regular expressions have distinguished subexpressions.  */)
 
   /* Put point back where it was in the text, if possible.  */
   TEMP_SET_PT (clip_to_bounds (BEGV, opoint + (opoint <= 0 ? ZV : 0), ZV));
-  /* Now move point "officially" to the start of the inserted replacement.  */
+  /* Now move point "officially" to the end of the inserted replacement.  */
   move_if_not_intangible (newpoint);
 
   return Qnil;
diff --git a/src/syntax.c b/src/syntax.c
index 066972e6d88..df07809aaaf 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1421,7 +1421,7 @@ DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value,
     {
       AUTO_STRING (prefixdoc,
                    ",\n\t  is a prefix character for `backward-prefix-chars'");
-      insert1 (Fsubstitute_command_keys (prefixdoc));
+      insert1 (call1 (Qsubstitute_command_keys, prefixdoc));
     }
 
   return syntax;
diff --git a/src/xterm.c b/src/xterm.c
index 2e0407aff40..98bb0ea8917 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8949,8 +8949,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #endif
 #ifdef USE_GTK
       if (!f
-          && (f = any)
-          && configureEvent.xconfigure.window == FRAME_X_WINDOW (f))
+          && (f = any)
+          && configureEvent.xconfigure.window == FRAME_X_WINDOW (f)
+          && FRAME_VISIBLE_P(f))
         {
           block_input ();
           if (FRAME_X_DOUBLE_BUFFERED_P (f))
@@ -8963,10 +8964,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                             configureEvent.xconfigure.height);
 #endif
           f = 0;
-        }
+        }
 #endif
-      if (f)
-        {
+      if (f && FRAME_VISIBLE_P(f))
+        {
 #ifdef USE_GTK
           /* For GTK+ don't call x_net_wm_state for the scroll bar
              window.  (Bug#24963, Bug#25887) */
@@ -9056,7 +9057,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
             xic_set_statusarea (f);
 #endif
 
-        }
+        }
       goto OTHER;
 
     case ButtonRelease: