[Emacs-diffs] Changes to emacs/lisp/language/thai-util.el

[Lute Kamstra]

Index: emacs/lisp/language/thai-util.el
diff -c emacs/lisp/language/thai-util.el:1.30 
emacs/lisp/language/thai-util.el:1.31
*** emacs/lisp/language/thai-util.el:1.30       Tue Mar 29 07:59:02 2005
--- emacs/lisp/language/thai-util.el    Mon Apr  4 09:17:41 2005
***************
*** 278,284 ****
  
  (defun thai-compose-syllable (beg end &optional category-set string)
    (or category-set
!       (setq category-set 
            (char-category-set (if string (aref string beg) (char-after beg)))))
    (if (aref category-set ?c)
        ;; Starting with a consonant.  We do relative composition.
--- 278,284 ----
  
  (defun thai-compose-syllable (beg end &optional category-set string)
    (or category-set
!       (setq category-set
            (char-category-set (if string (aref string beg) (char-after beg)))))
    (if (aref category-set ?c)
        ;; Starting with a consonant.  We do relative composition.
***************
*** 287,295 ****
        (compose-region beg end))
      ;; Vowel tone sequence.
      (if string
!       (compose-string string beg end (list (aref string beg) '(Bc . Bc) 
                                             (aref string (1+ beg))))
!       (compose-region beg end (list (char-after beg) '(Bc . Bc) 
                                    (char-after (1+ beg))))))
    (- end beg))
  
--- 287,295 ----
        (compose-region beg end))
      ;; Vowel tone sequence.
      (if string
!       (compose-string string beg end (list (aref string beg) '(Bc . Bc)
                                             (aref string (1+ beg))))
!       (compose-region beg end (list (char-after beg) '(Bc . Bc)
                                    (char-after (1+ beg))))))
    (- end beg))
  
***************
*** 347,353 ****
        (if string
          (if (eq (string-match thai-composition-pattern string from) from)
              (thai-compose-syllable from (match-end 0) nil string))
!       (if (save-excursion 
              (goto-char from)
              (and (looking-at thai-composition-pattern)
                   (setq to (match-end 0))))
--- 347,353 ----
        (if string
          (if (eq (string-match thai-composition-pattern string from) from)
              (thai-compose-syllable from (match-end 0) nil string))
!       (if (save-excursion
              (goto-char from)
              (and (looking-at thai-composition-pattern)
                   (setq to (match-end 0))))
***************
*** 375,381 ****
  ;;;###autoload
  (define-minor-mode thai-auto-composition-mode
    "Minor mode for automatically correct Thai character composition."
!   nil nil nil
    (cond ((null thai-auto-composition-mode)
         (remove-hook 'after-change-functions 'thai-auto-composition))
        (t
--- 375,381 ----
  ;;;###autoload
  (define-minor-mode thai-auto-composition-mode
    "Minor mode for automatically correct Thai character composition."
!   :group 'mule
    (cond ((null thai-auto-composition-mode)
         (remove-hook 'after-change-functions 'thai-auto-composition))
        (t
***************
*** 397,403 ****
  (define-minor-mode thai-word-mode
    "Minor mode to make word-oriented commands aware of Thai words.
  The commands affected are \\[forward-word], \\[backward-word], \\[kill-word], 
\\[backward-kill-word], \\[transpose-words], and \\[fill-paragraph]."
!   :global t
    (cond (thai-word-mode
         ;; This enables linebreak between Thai characters.
         (modify-category-entry (make-char 'thai-tis620) ?|)
--- 397,403 ----
  (define-minor-mode thai-word-mode
    "Minor mode to make word-oriented commands aware of Thai words.
  The commands affected are \\[forward-word], \\[backward-word], \\[kill-word], 
\\[backward-kill-word], \\[transpose-words], and \\[fill-paragraph]."
!   :global t :group 'mule
    (cond (thai-word-mode
         ;; This enables linebreak between Thai characters.
         (modify-category-entry (make-char 'thai-tis620) ?|)