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

2 files changed, 15 insertions, 1 deletions

diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 1c356698f66..6e87cb94897 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1313,4 +1313,18 @@ with parameters from the *Messages* buffer modification."
         (ovshould nonempty-eob-end 4 5)
         (ovshould empty-eob        5 5)))))
 
+(ert-deftest buffer-multibyte-overlong-sequences ()
+  (dolist (uni '("\xE0\x80\x80"
+                 "\xF0\x80\x80\x80"
+                 "\xF8\x8F\xBF\xBF\x80"))
+    (let ((multi (string-to-multibyte uni)))
+      (should
+       (string-equal
+        multi
+        (with-temp-buffer
+          (set-buffer-multibyte nil)
+          (insert uni)
+          (set-buffer-multibyte t)
+          (buffer-string)))))))
+
 ;;; buffer-tests.el ends here
diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el
index 6673ac4b4eb..5d85fc74e50 100644
--- a/test/src/thread-tests.el
+++ b/test/src/thread-tests.el
@@ -112,7 +112,7 @@
   (should-error (thread-join (current-thread))))
 
 (ert-deftest threads-join-error ()
-  "Test of error signalling from `thread-join'."
+  "Test of error signaling from `thread-join'."
   :tags '(:unstable)
   (skip-unless (featurep 'threads))
   (let ((thread (make-thread #'threads-call-error)))