Merge from emacs--rel--22

[bpt/emacs.git] / lisp / language / thai-word.el

diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index 956cf27..3162b50 100644 (file)
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -1,7 +1,8 @@
 ;;; thai-word.el -- find Thai word boundaries
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004
-;; Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Author: Kenichi HANDA <handa@etl.go.jp>
 
@@ -19,7 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; The used Thai word list has been taken from IBM's ICU4J project
 ;; (file `thai6.ucs', version 1.4, converted to TIS encoding, with
@@ -72,13 +74,10 @@
 ;; which means that you can easily index the list character by
 ;; character.
 
-(defconst thai-word-table nil)
-
-
-;; Set up `thai-word-table'.
-
-(let
-    ((l
+(defvar thai-word-table
+  (let ((table (list 'thai-words)))
+    (dolist (elt
+      ;;; The following is indented as this to minimize this file size.
       '("¡¡"
        "¡¡Å"
        "¡¡Ø¸Àѳ±ì"
@@ -10732,11 +10731,10 @@
        "äÎâ¡ÃÁÔàµÍÃì"
        "äÎâ´Ã¤ÒÃìºÍ¹"
        "äÎâÅ"
-       )))
-  (setq thai-word-table (list 'thai-words))
-  (while l
-    (set-nested-alist (car l) 1 thai-word-table)
-    (setq l (cdr l))))
+       ))
+      (set-nested-alist elt 1 table))
+    table)
+  "Nested alist of Thai words.") 
 
 
 (defun thai-update-word-table (file &optional append)
@@ -10783,7 +10781,7 @@ the current word list."
       ;; character by character.
       (while this
        (setq pos (1+ pos)
-             char (char-after pos)
+             char (or (char-after pos) 0)
              category-set (char-category-set char))
        ;; If the current sequence is recorded in `thai-word-table'
        ;; (i.e. (car THIS) is 1) and the following Thai character is
@@ -10807,7 +10805,7 @@ the current word list."
 
 
 ;; Move point forward to the end of Thai word which follows point and
-;; update VEC. VEC is a vector of three elements used to cache word
+;; update VEC.  VEC is a vector of three elements used to cache word
 ;; end positions.  The Nth element, if non-nil, is a list of end
 ;; points of the Nth word, or t indicating that there is no Thai
 ;; character.  LIMIT limits the point movement.
@@ -10888,7 +10886,7 @@ the current word list."
          nil)
        (progn
          ;; We found four succeeding Thai words (or LIMIT has been
-         ;; reached).  Move to the end of the first word.
+         ;; reached).  Move to the end of the first word.
          (goto-char (car v0))
          ;; Update VEC for the next function call.  If no larger word
          ;; positions have been found, set the corresponding vector
@@ -10901,7 +10899,7 @@ the current word list."
              (aset vec 1 v2)
              (aset vec 2 v3)))) ; exit function successfully
 
-      ;; We didn't find four consecutive words.         If we have found a
+      ;; We didn't find four consecutive words.  If we have found a
       ;; `second best' solution and the length of those two words is
       ;; longer than the longest word we can see at the current point,
       ;; adopt the second best solution.  This decision is based on
@@ -11042,6 +11040,33 @@ If COUNT is negative, move point forward (- COUNT) words."
   (thai-forward-word (- count)))
 
 
+(defun thai-kill-word (arg)
+  "Like kill-word but pay attention to Thai word boundaries.
+With argument, do this that many times."
+  (interactive "p")
+  (kill-region (point) (progn (thai-forward-word arg) (point))))
+
+
+(defun thai-backward-kill-word (arg)
+  "Like backward-kill-word but pay attention to Thai word boundaries."
+  (interactive "p")
+  (thai-kill-word (- arg)))
+
+
+(defun thai-transpose-words (arg)
+  "Like transpose-words but pay attention to Thai word boundaries."
+  (interactive "*p")
+  (transpose-subr 'thai-forward-word arg))
+
+(defun thai-fill-find-break-point (linebeg)
+  "Go to a line breaking position near point considering Thai word boundaries."
+  (let ((pos (point)))
+    (thai-forward-word -1)
+    (when (<= (point) linebeg)
+      (goto-char pos)
+      (thai-forward-word 1))
+    (kinsoku linebeg)))
+
 (provide 'thai-word)
 
 
@@ -11050,3 +11075,5 @@ If COUNT is negative, move point forward (- COUNT) words."
 ;; End:
 
 ;; end of thai-word.el
+
+;; arch-tag: 29927f02-e177-4224-a270-7e67210b038a