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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/character.c b/src/character.c
index ae153a579d6..9389e1c0098 100644
--- a/src/character.c
+++ b/src/character.c
@@ -470,7 +470,7 @@ used for non-Latin and other unusual characters (such as emoji) is
 ignored as well, as are display properties and invisible text.
 For these reasons, the results are not generally reliable;
 for accurate dimensions of text as it will be displayed,
-use `window-text-pixel-size' instead.
+use `string-pixel-width' or `window-text-pixel-size' instead.
 usage: (string-width STRING &optional FROM TO)  */)
   (Lisp_Object str, Lisp_Object from, Lisp_Object to)
 {
diff --git a/src/keyboard.c b/src/keyboard.c
index f60b5c95654..ee42b821dfa 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11659,8 +11659,8 @@ the command loop or by `read-key-sequence'.
 The value is always a vector.  */)
   (void)
 {
-  return Fvector (this_command_key_count
-                  - this_single_command_key_start,
+  ptrdiff_t nkeys = this_command_key_count - this_single_command_key_start;
+  return Fvector (nkeys < 0 ? 0 : nkeys,
                   (XVECTOR (this_command_keys)->contents
                    + this_single_command_key_start));
 }