1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 5a9a1924de5..37a0f49493c 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -444,9 +444,13 @@ See also docstring of the function tibetan-compose-region."
         (work-buf (get-buffer-create " *tibetan-work*")))
     (set-buffer work-buf)
     (erase-buffer)
-    (insert-buffer-substring old-buf from to)
+    (if (stringp from)
+        (insert from)
+      (insert-buffer-substring old-buf from to))
     (if (not tibetan-decomposed-temp)
-        (tibetan-decompose-region (point-min) (point-max)))))
+        (tibetan-decompose-region (point-min) (point-max)))
+    ;; Should return nil as annotations.
+    nil))
 
 (provide 'language/tibet-util)