summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2008-09-05 01:01:02 +0000
committerKenichi Handa <handa@m17n.org>2008-09-05 01:01:02 +0000
commitd51659522f0da903bbd1eb1dd76fd441c93ca4da (patch)
tree7752196c9222032565d605bcf7aebe6faaee1290
parent8b1c87bf324961e9690ea10871a8411f2bc26524 (diff)
downloademacs-d51659522f0da903bbd1eb1dd76fd441c93ca4da.tar.gz
emacs-d51659522f0da903bbd1eb1dd76fd441c93ca4da.tar.bz2
emacs-d51659522f0da903bbd1eb1dd76fd441c93ca4da.zip
Fix setting of composition-function-table.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/language/tibetan.el5
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd7e5bc9bc6..831b191832d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-05 Kenichi Handa <handa@m17n.org>
+
+ * language/tibetan.el: Fix setting of composition-function-table.
+
+ * composite.el (find-composition): Mention about the automatic
+ composition in the docstring.
+
+ * descr-text.el (describe-char): Fix handling of automatic
+ composition.
+
2008-09-04 Juanma Barranquero <lekktu@gmail.com>
* net/tramp-cache.el (tramp-flush-file-function): Fix typo in docstring.
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index b22bfd6711e..cf4f98296d5 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -604,8 +604,9 @@ This also matches some punctuation characters which need conversion.")
(defvar tibetan-decomposed-temp nil)
;; For automatic composition.
-(set-char-table-range composition-function-table '(#xF00 . #xFD1)
- '(("[\xF00-\xFD1]+" . tibetan-composition-function)))
+(set-char-table-range
+ composition-function-table '(#xF00 . #xFD1)
+ (list (vector tibetan-composable-pattern 0 'font-shape-gstring)))
(provide 'tibetan)