Merge remote-tracking branch 'origin/master' into feature/android

3 files changed, 22 insertions, 9 deletions

diff --git a/src/fringe.c b/src/fringe.c
index ac7cb57695f..3452c8503f0 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -211,14 +211,14 @@ static unsigned short right_curly_arrow_bits[] = {
 
 /* Large circle bitmap.  */
 /*
-  ........
   ..xxxx..
   .xxxxxx.
   xxxxxxxx
   xxxxxxxx
+  xxxxxxxx
+  xxxxxxxx
   .xxxxxx.
   ..xxxx..
-  ........
 */
 static unsigned short large_circle_bits[] = {
   0x3c, 0x7e, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3c};
diff --git a/src/keymap.c b/src/keymap.c
index efac410d317..7f5777c9251 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3308,13 +3308,18 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
       if (this_shadowed)
         {
           SET_PT (PT - 1);
-          static char const fmt[] = "  (currently shadowed by `%s')";
-          USE_SAFE_ALLOCA;
-          char *buffer = SAFE_ALLOCA (sizeof fmt +
-                                      SBYTES (SYMBOL_NAME (shadowed_by)));
-          esprintf (buffer, fmt, SDATA (SYMBOL_NAME (shadowed_by)));
-          insert_string (buffer);
-          SAFE_FREE();
+          if (SYMBOLP (shadowed_by))
+            {
+              static char const fmt[] = "  (currently shadowed by `%s')";
+              USE_SAFE_ALLOCA;
+              char *buffer =
+                SAFE_ALLOCA (sizeof fmt + SBYTES (SYMBOL_NAME (shadowed_by)));
+              esprintf (buffer, fmt, SDATA (SYMBOL_NAME (shadowed_by)));
+              insert_string (buffer);
+              SAFE_FREE();
+            }
+          else  /* Could be a keymap, a lambda, or a keyboard macro.  */
+            insert_string ("  (currently shadowed)");
           SET_PT (PT + 1);
         }
     }
diff --git a/src/term.c b/src/term.c
index 05163cce533..2fa06d71f03 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4252,7 +4252,15 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
   tty->TS_enter_alt_charset_mode = tgetstr ("as", address);
   tty->TS_exit_alt_charset_mode = tgetstr ("ae", address);
   tty->TS_exit_attribute_mode = tgetstr ("me", address);
+#ifdef TERMINFO
+  tty->TS_enter_strike_through_mode = tigetstr ("smxx");
+  if (tty->TS_enter_strike_through_mode == (char *) (intptr_t) -1)
+    tty->TS_enter_strike_through_mode = NULL;
+#else
+  /* FIXME: Is calling tgetstr here for non-terminfo case correct,
+     even though "smxx" is more than 2 characters?  */
   tty->TS_enter_strike_through_mode = tgetstr ("smxx", address);
+#endif
 
   MultiUp (tty) = tgetstr ("UP", address);
   MultiDown (tty) = tgetstr ("DO", address);