diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:07:17 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:07:17 +0000 |
| commit | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (patch) | |
| tree | 00f5484d576513deddd938a9a277d0db860b9a5b /leim | |
| parent | ebe4c71027cd6ec8583631e895e7fdd3decfc099 (diff) | |
| parent | b6ff295c434269fe824ec47cbfc87c6a02dfd94d (diff) | |
| download | emacs-fdc9061358d3654e14bfc1419632e1d6c6c5c13e.tar.gz | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 11 | ||||
| -rw-r--r-- | leim/quail/indian.el | 13 |
2 files changed, 14 insertions, 10 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 31394421144..3db8501fbdc 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -2,6 +2,11 @@ * quail/latin-ltx.el ("\\qed"): Add this rule. +2007-10-24 Juanma Barranquero <lekktu@gmail.com> + + * quail/indian.el (quail-indian-update-preceding-char): + Don't mark the variable as frame-local; it wasn't used as such. + 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. @@ -19,7 +24,7 @@ 2007-01-30 Kenichi Handa <handa@m17n.org> * CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/PY-b5.tit, CXTERM-DIC/SW.tit, - CXTERM-DIC/TONEPY.tit: Add copyright and license notices. + * CXTERM-DIC/TONEPY.tit: Add copyright and license notices. * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Add copyright and license notices. @@ -31,8 +36,8 @@ * CXTERM-DIC/README: New file. * CXTERM-DIC/4Corner.tit, CXTERM-DIC/CCDOSPY.tit, - CXTERM-DIC/PY-b5.tit, CXTERM-DIC/QJ-b5.tit, CXTERM-DIC/QJ.tit, - CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: Updated from + * CXTERM-DIC/PY-b5.tit, CXTERM-DIC/QJ-b5.tit, CXTERM-DIC/QJ.tit, + * CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: Updated from X11R6/contrib/programs/cxterm. * ja-dic/ja-dic.el: Regenerated. diff --git a/leim/quail/indian.el b/leim/quail/indian.el index e8e48fc6063..90f84c2df09 100644 --- a/leim/quail/indian.el +++ b/leim/quail/indian.el @@ -47,13 +47,12 @@ nil))) (defvar quail-indian-update-preceding-char nil) -(make-variable-frame-local 'quail-indian-update-preceding-char) ;; Input value :: ;; CONTROL-FLAG is integer `n' ;; quail-current-key :: keyboard input. ;; Only first `n' can be translated. -;; quail-current-str :: corresonding string. +;; quail-current-str :: corresonding string. ;; jobs :: (1) put last (len-n) char to unrread-command-event. ;; (2) put translated string to quail-current-str. ;; @@ -62,8 +61,8 @@ ;; quail-current-str :: corresponding string. ;; jobs :: (1) put modified translated string to quail-current-str. ;; -;; When non-nil value is returned from quail-translation-update-function, -;; the quail-current-str is split to characters and put into event queue, +;; When non-nil value is returned from quail-translation-update-function, +;; the quail-current-str is split to characters and put into event queue, ;; with `compose-last-char' event with composition info at the end. (defun quail-indian-update-translation (control-flag) @@ -79,7 +78,7 @@ ;; Check the preceding character of the quail region. If the ;; preceding character can be composed with quail-current-str, then ;; grab that preceding character into the quail-current-str and - ;; remove that char from the region. + ;; remove that char from the region. (let* (prec-char-position composition-regexp prec-char-str candidate-str match-pos match-end) (when (and quail-current-str @@ -103,9 +102,9 @@ (setq quail-indian-update-preceding-char prec-char-str) (delete-region prec-char-position (overlay-start quail-overlay)))) - (setq quail-current-str + (setq quail-current-str (indian-compose-string - (concat quail-indian-update-preceding-char + (concat quail-indian-update-preceding-char quail-current-str))) (if (numberp control-flag) (setq unread-command-events |