(thai-composition-function): Don't use prog1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e310fb66fc88ae1b41e1543ae623dee26e75a0a3..0903cfa8e447204ac82d0a92133660717d9ad73e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2002-10-28  Dave Love  <fx@gnu.org>
 
+       * language/thai-util.el (thai-composition-function): Don't use prog1.
+
+       * language/lao-util.el (lao-composition-function): Don't use prog1.
+
+       * language/european.el (diacritic-composition-function): Modify
+       confused prog1 form.
+
        * international/quail.el (quail-keyboard-layout-alist): Fix
        pc105-uk.
        (quail-keyboard-layout): Customize.

diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index 35914c2cc5b2430f61bc3e83907316496ce1f460..bbf116485eabedc23604ac5b38161fdf0fbddb48 100644 (file)
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -286,7 +286,7 @@ to compose.
 
 The return value is number of composed characters."
   (if (< (1+ from) to)
-      (prog1 (- to from)
+      (progn
        (if string
            (compose-string string from to)
          (compose-region from to))