* lisp/progmodes/ruby-mode.el: Bump the version to 1.2.

[gnu-emacs] / lisp / language / lao-util.el

diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index adbe30f0622347d5d557e99a6476b77b65a2f046..863e3ba89a3763249d018adb385bac39c46b602b 100644 (file)
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -1,9 +1,8 @@
 ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008
+;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -372,8 +371,8 @@ consonant.  It is a list vowel characters or 0.  The element 0
 indicate the place to embed a consonant.
 
 Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL
-follwoing a consonant and preceding a maa-sakod character.  If it is
-nil, NO-MAA-SAKOD-RULE is used.  The maa-sakod character is alwasy
+following a consonant and preceding a maa-sakod character.  If it is
+nil, NO-MAA-SAKOD-RULE is used.  The maa-sakod character is always
 appended at the tail.
 
 For instance, rule `(\"\e(1`WM\e(B\" (?\e(1`\e(B t ?\e(1W\e(B ?\e(1M\e(B))' tells that this vowel
@@ -387,7 +386,7 @@ character MAA-SAKOD-n.")
   "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string.
 Only the first syllable is transcribed.
 The value has the form: (START END LAO-STRING), where
-START and END are the beggining and end positions of the Roman Lao syllable,
+START and END are the beginning and end positions of the Roman Lao syllable,
 LAO-STRING is the Lao character transcription of it.
 
 Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao
@@ -491,17 +490,17 @@ syllable.  In that case, FROM and TO are indexes to STR."
       lao-str)))
 
 ;;;###autoload
-(defun lao-composition-function (from to font-object string)
-  (if (= (lgstirng-char-len gstring) 1)
+(defun lao-composition-function (gstring)
+  (if (= (lgstring-char-len gstring) 1)
       (compose-gstring-for-graphic gstring)
-    (or (font-shape-text from to font-object string))
+    (or (font-shape-gstring gstring)
        (let ((glyph-len (lgstring-glyph-len gstring))
              (i 0)
              glyph)
          (while (and (< i glyph-len)
                      (setq glyph (lgstring-glyph gstring i)))
            (setq i (1+ i)))
-         (compose-glyph-string-relative gstring 0 i 0.1))))
+         (compose-glyph-string-relative gstring 0 i 0.1)))))
 
 ;;;###autoload
 (defun lao-compose-region (from to)
@@ -516,5 +515,4 @@ syllable.  In that case, FROM and TO are indexes to STR."
 ;;
 (provide 'lao-util)
 
-;; arch-tag: 1f828781-3cb8-4695-88af-8f33222338ce
 ;;; lao-util.el ends here