aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa1998-12-15 04:35:38 +0000
committerKenichi Handa1998-12-15 04:35:38 +0000
commit7bbc9d9f7b964ccbf12139bc1e6735743e238db5 (patch)
tree7de61a2a53b41af0cff6060a011ae9c1ec0ad809
parent190ce6342775b55ebb1df7ca0ac63425a39b4bca (diff)
downloademacs-7bbc9d9f7b964ccbf12139bc1e6735743e238db5.tar.gz
emacs-7bbc9d9f7b964ccbf12139bc1e6735743e238db5.zip
(quail-devanagari-compose-characters):
Adjusted for the change of input method handling. (quail-devanagari-hindi-compose-characters): Likewise.
-rw-r--r--leim/quail/devanagari.el34
1 files changed, 14 insertions, 20 deletions
diff --git a/leim/quail/devanagari.el b/leim/quail/devanagari.el
index 9fd25c8f1af..9d840b91bf7 100644
--- a/leim/quail/devanagari.el
+++ b/leim/quail/devanagari.el
@@ -55,16 +55,13 @@
55 (let* ((from (overlay-start quail-conv-overlay)) 55 (let* ((from (overlay-start quail-conv-overlay))
56 (to (overlay-end quail-conv-overlay)) 56 (to (overlay-end quail-conv-overlay))
57 (dstr (buffer-substring from to))) 57 (dstr (buffer-substring from to)))
58 (delete-overlay quail-overlay) 58 (setq overriding-terminal-local-map nil
59 (delete-overlay quail-conv-overlay) 59 quail-converting nil
60 (save-restriction 60 quail-conversion-str
61 (narrow-to-region from to) 61 (concat (devanagari-compose-string dstr 'sanskrit)
62 (goto-char (point-min)) 62 (list (if (numberp last-command-char)
63 (delete-region (point-min) (point-max)) 63 last-command-char
64 (insert (devanagari-compose-string dstr 'sanskrit)) 64 (get last-command-char 'ascii-character))))))))
65 (goto-char (point-max)))
66 (setq overriding-terminal-local-map nil)))
67 (setq unread-command-events (list last-command-event)))
68 65
69(quail-define-package 66(quail-define-package
70 "devanagari-keyboard-a" "Devanagari" "DevK" t 67 "devanagari-keyboard-a" "Devanagari" "DevK" t
@@ -467,16 +464,13 @@ Special Keys : Anuswar n'
467 (let* ((from (overlay-start quail-conv-overlay)) 464 (let* ((from (overlay-start quail-conv-overlay))
468 (to (overlay-end quail-conv-overlay)) 465 (to (overlay-end quail-conv-overlay))
469 (dstr (buffer-substring from to))) 466 (dstr (buffer-substring from to)))
470 (delete-overlay quail-overlay) 467 (setq overriding-terminal-local-map nil
471 (delete-overlay quail-conv-overlay) 468 quail-converting nil
472 (save-restriction 469 quail-conversion-str
473 (narrow-to-region from to) 470 (concat (devanagari-compose-string dstr)
474 (goto-char (point-min)) 471 (list (if (numberp last-command-char)
475 (delete-region (point-min) (point-max)) 472 last-command-char
476 (insert (devanagari-compose-string dstr)) 473 (get last-command-char 'ascii-character))))))))
477 (goto-char (point-max)))
478 (setq overriding-terminal-local-map nil)))
479 (setq unread-command-events (list last-command-event)))
480 474
481(eval-when-compile 475(eval-when-compile
482 476