diff options
| author | Juanma Barranquero | 2007-10-24 11:49:17 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-24 11:49:17 +0000 |
| commit | 92f137df2e102e42eab7bf3e0dba5c86bb8371da (patch) | |
| tree | 6f45bc591a979247926ba3084e509592225f1e65 | |
| parent | a8d7b1a0a03e2faaa4e8fb8e2ddf4ece4cb9aee5 (diff) | |
| download | emacs-92f137df2e102e42eab7bf3e0dba5c86bb8371da.tar.gz emacs-92f137df2e102e42eab7bf3e0dba5c86bb8371da.zip | |
(quail-indian-update-preceding-char): Don't mark the variable as frame-local;
it wasn't used as such.
| -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 a9292e3550c..9475635653d 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-24 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * quail/indian.el (quail-indian-update-preceding-char): | ||
| 4 | Don't mark the variable as frame-local; it wasn't used as such. | ||
| 5 | |||
| 1 | 2007-07-25 Glenn Morris <rgm@gnu.org> | 6 | 2007-07-25 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * Relicense all FSF files to GPLv3 or later. | 8 | * Relicense all FSF files to GPLv3 or later. |
| @@ -15,7 +20,7 @@ | |||
| 15 | 2007-01-30 Kenichi Handa <handa@m17n.org> | 20 | 2007-01-30 Kenichi Handa <handa@m17n.org> |
| 16 | 21 | ||
| 17 | * CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/PY-b5.tit, CXTERM-DIC/SW.tit, | 22 | * CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/PY-b5.tit, CXTERM-DIC/SW.tit, |
| 18 | CXTERM-DIC/TONEPY.tit: Add copyright and license notices. | 23 | * CXTERM-DIC/TONEPY.tit: Add copyright and license notices. |
| 19 | 24 | ||
| 20 | * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Add copyright and | 25 | * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Add copyright and |
| 21 | license notices. | 26 | license notices. |
| @@ -27,8 +32,8 @@ | |||
| 27 | * CXTERM-DIC/README: New file. | 32 | * CXTERM-DIC/README: New file. |
| 28 | 33 | ||
| 29 | * CXTERM-DIC/4Corner.tit, CXTERM-DIC/CCDOSPY.tit, | 34 | * CXTERM-DIC/4Corner.tit, CXTERM-DIC/CCDOSPY.tit, |
| 30 | CXTERM-DIC/PY-b5.tit, CXTERM-DIC/QJ-b5.tit, CXTERM-DIC/QJ.tit, | 35 | * CXTERM-DIC/PY-b5.tit, CXTERM-DIC/QJ-b5.tit, CXTERM-DIC/QJ.tit, |
| 31 | CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: Updated from | 36 | * CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: Updated from |
| 32 | X11R6/contrib/programs/cxterm. | 37 | X11R6/contrib/programs/cxterm. |
| 33 | 38 | ||
| 34 | * ja-dic/ja-dic.el: Regenerated. | 39 | * 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 @@ | |||
| 47 | nil))) | 47 | nil))) |
| 48 | 48 | ||
| 49 | (defvar quail-indian-update-preceding-char nil) | 49 | (defvar quail-indian-update-preceding-char nil) |
| 50 | (make-variable-frame-local 'quail-indian-update-preceding-char) | ||
| 51 | 50 | ||
| 52 | ;; Input value :: | 51 | ;; Input value :: |
| 53 | ;; CONTROL-FLAG is integer `n' | 52 | ;; CONTROL-FLAG is integer `n' |
| 54 | ;; quail-current-key :: keyboard input. | 53 | ;; quail-current-key :: keyboard input. |
| 55 | ;; Only first `n' can be translated. | 54 | ;; Only first `n' can be translated. |
| 56 | ;; quail-current-str :: corresonding string. | 55 | ;; quail-current-str :: corresonding string. |
| 57 | ;; jobs :: (1) put last (len-n) char to unrread-command-event. | 56 | ;; jobs :: (1) put last (len-n) char to unrread-command-event. |
| 58 | ;; (2) put translated string to quail-current-str. | 57 | ;; (2) put translated string to quail-current-str. |
| 59 | ;; | 58 | ;; |
| @@ -62,8 +61,8 @@ | |||
| 62 | ;; quail-current-str :: corresponding string. | 61 | ;; quail-current-str :: corresponding string. |
| 63 | ;; jobs :: (1) put modified translated string to quail-current-str. | 62 | ;; jobs :: (1) put modified translated string to quail-current-str. |
| 64 | ;; | 63 | ;; |
| 65 | ;; When non-nil value is returned from quail-translation-update-function, | 64 | ;; When non-nil value is returned from quail-translation-update-function, |
| 66 | ;; the quail-current-str is split to characters and put into event queue, | 65 | ;; the quail-current-str is split to characters and put into event queue, |
| 67 | ;; with `compose-last-char' event with composition info at the end. | 66 | ;; with `compose-last-char' event with composition info at the end. |
| 68 | 67 | ||
| 69 | (defun quail-indian-update-translation (control-flag) | 68 | (defun quail-indian-update-translation (control-flag) |
| @@ -79,7 +78,7 @@ | |||
| 79 | ;; Check the preceding character of the quail region. If the | 78 | ;; Check the preceding character of the quail region. If the |
| 80 | ;; preceding character can be composed with quail-current-str, then | 79 | ;; preceding character can be composed with quail-current-str, then |
| 81 | ;; grab that preceding character into the quail-current-str and | 80 | ;; grab that preceding character into the quail-current-str and |
| 82 | ;; remove that char from the region. | 81 | ;; remove that char from the region. |
| 83 | (let* (prec-char-position composition-regexp | 82 | (let* (prec-char-position composition-regexp |
| 84 | prec-char-str candidate-str match-pos match-end) | 83 | prec-char-str candidate-str match-pos match-end) |
| 85 | (when (and quail-current-str | 84 | (when (and quail-current-str |
| @@ -103,9 +102,9 @@ | |||
| 103 | (setq quail-indian-update-preceding-char prec-char-str) | 102 | (setq quail-indian-update-preceding-char prec-char-str) |
| 104 | (delete-region prec-char-position | 103 | (delete-region prec-char-position |
| 105 | (overlay-start quail-overlay)))) | 104 | (overlay-start quail-overlay)))) |
| 106 | (setq quail-current-str | 105 | (setq quail-current-str |
| 107 | (indian-compose-string | 106 | (indian-compose-string |
| 108 | (concat quail-indian-update-preceding-char | 107 | (concat quail-indian-update-preceding-char |
| 109 | quail-current-str))) | 108 | quail-current-str))) |
| 110 | (if (numberp control-flag) | 109 | (if (numberp control-flag) |
| 111 | (setq unread-command-events | 110 | (setq unread-command-events |