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

3 files changed, 26 insertions, 5 deletions

diff --git a/src/json.c b/src/json.c
index 30027675580..814afc6d741 100644
--- a/src/json.c
+++ b/src/json.c
@@ -365,6 +365,7 @@ lisp_to_json_toplevel_1 (Lisp_Object lisp,
           Lisp_Object key = HASH_KEY (h, i);
           if (!EQ (key, Qunbound))
             {
+              CHECK_STRING (key);
               Lisp_Object ekey = json_encode (key);
               /* We can't specify the length, so the string must be
                NUL-terminated.  */
@@ -975,6 +976,7 @@ usage: (json-parse-string STRING &rest ARGS) */)
 #endif
 
   Lisp_Object string = args[0];
+  CHECK_STRING (string);
   Lisp_Object encoded = json_encode (string);
   check_string_without_embedded_nuls (encoded);
   struct json_configuration conf =
diff --git a/src/keyboard.c b/src/keyboard.c
index f9b9399d502..5fa58abce1d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10531,7 +10531,7 @@ The value is always a vector.  */)
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,
        Sclear_this_command_keys, 0, 1, 0,
        doc: /* Clear out the vector that `this-command-keys' returns.
-Also clear the record of the last 100 events, unless optional arg
+Also clear the record of the last 300 input events, unless optional arg
 KEEP-RECORD is non-nil.  */)
   (Lisp_Object keep_record)
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index e454fd7b83f..97c55cdf5b8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1872,10 +1872,13 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
                   /* Account for line-number display, if IT3 still
                      didn't.  This can happen if START - 1 is the
                      first or the last character on its display line.  */
-                  if (it3.lnum_pixel_width > 0)
-                    top_x += it3.lnum_pixel_width;
-                  else if (it.line_number_produced_p)
-                    top_x += it.lnum_pixel_width;
+                  if (!it3.line_number_produced_p)
+                    {
+                      if (it3.lnum_pixel_width > 0)
+                        top_x += it3.lnum_pixel_width;
+                      else if (it.line_number_produced_p)
+                        top_x += it.lnum_pixel_width;
+                    }
                   /* Normally, we would exit the above loop because we
                      found the display element whose character
                      position is CHARPOS.  For the contingency that we
@@ -26382,6 +26385,22 @@ decode_mode_spec (struct window *w, register int c, int field_width,
         startpos = marker_position (w->start);
         startpos_byte = marker_byte_position (w->start);
         height = WINDOW_TOTAL_LINES (w);
+        /* We cannot cope with w->start being outside of the
+           accessible portion of the buffer; in particular,
+           display_count_lines call below will infloop if called with
+           startpos_byte outside of the [BEGV_BYTE..ZV_BYTE] region.
+           Such w->start means we were called in some "creative" way
+           when the buffer's restriction was changed, but the window
+           wasn't yet redisplayed after that.  If that happens, we
+           need to determine a new base line.  */
+        if (!(BUF_BEGV_BYTE (b) <= startpos_byte
+              && startpos_byte <= BUF_ZV_BYTE (b)))
+          {
+            startpos = BUF_BEGV (b);
+            startpos_byte = BUF_BEGV_BYTE (b);
+            w->base_line_pos = 0;
+            w->base_line_number = 0;
+          }
 
         /* If we decided that this buffer isn't suitable for line numbers,
            don't forget that too fast.  */