Merge from emacs--devo--0

[gnu-emacs] / lisp / language / kannada.el

diff --git a/lisp/language/kannada.el b/lisp/language/kannada.el
index 3f1ec25c541ae2e5f87489020260ac44e07acd10..f174e6e4d5035c900621e3cda38700d7515f27c8 100644 (file)
--- a/lisp/language/kannada.el
+++ b/lisp/language/kannada.el
@@ -39,12 +39,16 @@
                (features knd-util)
                (sample-text
                 . (kannada-compose-string
-                   (copy-sequence "Kannada (\e4\e$,43Ov#4z\e0\e$,1>u\e1\e4\e$,44Kv#4zv#4M\e0\e$,1?(?M?(\e1\e4\e$,43sv#4z\e0\e$,1?!\e1\e(B)     \e4\e$,44Kv#4z\e0\e$,1?(\e1\e4\e$,44hv#4zv#4\7f\e0\e$,1?.\e1\e4\e$,44qv#4{v#3Q\e0\e$,1?8?M>u?>\e1\e4\e$,44av#4z\e0\e$,1?0\e1\e(B")))
+                   (copy-sequence "Kannada (\e$,1>u?(?M?(?!\e(B) \e$,1?(?.?8?M>u?>?0\e(B")))
                (documentation . "\
 Kannada language and script is supported in this language
 environment.")) 
  '("Indian"))
 
+;; For automatic composition.
+(set-char-table-range composition-function-table '(#x0c80 . #x0cff)
+                     '(("[\x0c80-\x0CFF]+" . font-shape-text)))
+
 (provide 'kannada)
 
 ;;; arch-tag: 880ba90b-f6f5-4131-bc1d-930705b78416