aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2002-10-28 14:43:51 +0000
committerDave Love2002-10-28 14:43:51 +0000
commita3fac65a7898dd17e752f2ae586d29e5b18b97ad (patch)
treef974dd367ae28e64b5240707ed9a8830a8d5af06
parente10fd9a8c8d4dab01812f33c03be0ff3fd362308 (diff)
downloademacs-a3fac65a7898dd17e752f2ae586d29e5b18b97ad.tar.gz
emacs-a3fac65a7898dd17e752f2ae586d29e5b18b97ad.zip
(thai-composition-function): Don't use prog1.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/language/thai-util.el2
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e310fb66fc8..0903cfa8e44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
12002-10-28 Dave Love <fx@gnu.org> 12002-10-28 Dave Love <fx@gnu.org>
2 2
3 * language/thai-util.el (thai-composition-function): Don't use prog1.
4
5 * language/lao-util.el (lao-composition-function): Don't use prog1.
6
7 * language/european.el (diacritic-composition-function): Modify
8 confused prog1 form.
9
3 * international/quail.el (quail-keyboard-layout-alist): Fix 10 * international/quail.el (quail-keyboard-layout-alist): Fix
4 pc105-uk. 11 pc105-uk.
5 (quail-keyboard-layout): Customize. 12 (quail-keyboard-layout): Customize.
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index 35914c2cc5b..bbf116485ea 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -286,7 +286,7 @@ to compose.
286 286
287The return value is number of composed characters." 287The return value is number of composed characters."
288 (if (< (1+ from) to) 288 (if (< (1+ from) to)
289 (prog1 (- to from) 289 (progn
290 (if string 290 (if string
291 (compose-string string from to) 291 (compose-string string from to)
292 (compose-region from to)) 292 (compose-region from to))