* src/fns.c (Flength): Fix char table length off-by-one bug.

(cherry picked from commit 52b96d3a7e27e0cdc3f53041f2f18cbe2c095a86)

diff --git a/src/fns.c b/src/fns.c
index a821d73b9e5b4165e31b9fad87e08143bbcac05e..599c0ec326c65885b6303ab80270e68786c88626 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -147,7 +147,7 @@ efficient.  */)
   else if (VECTORP (sequence))
     val = ASIZE (sequence);
   else if (CHAR_TABLE_P (sequence))
-    val = MAX_CHAR;
+    val = MAX_CHAR + 1;
   else if (BOOL_VECTOR_P (sequence))
     val = bool_vector_size (sequence);
   else if (CLOSUREP (sequence) || RECORDP (sequence))

diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index 8e540d982dda203c8dfe1488fe2368cbd5bb31ef..89ac3ef3ba93f9b90c202ca5c4945a1fd8afbfe7 100644 (file)
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -52,7 +52,8 @@
   (should (= (length '(1 2 3)) 3))
   (should (= (length '[1 2 3]) 3))
   (should (= (length "foo") 3))
-  (should-error (length t)))
+  (should-error (length t))
+  (should (= (length (make-char-table 'fns-tests)) (1+ (max-char)))))
 
 (ert-deftest fns-tests-safe-length ()
   (should (= (safe-length '(1 2 3)) 3)))