From: Juanma Barranquero Date: Wed, 24 Oct 2007 11:49:17 +0000 (+0000) Subject: (quail-indian-update-preceding-char): Don't mark the variable as frame-local; X-Git-Tag: emacs-pretest-22.1.90~514 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92f137df2e102e42eab7bf3e0dba5c86bb8371da;p=emacs.git (quail-indian-update-preceding-char): Don't mark the variable as frame-local; it wasn't used as such. --- diff --git a/leim/ChangeLog b/leim/ChangeLog index a9292e3550c..9475635653d 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2007-10-24 Juanma Barranquero + + * 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 * Relicense all FSF files to GPLv3 or later. @@ -15,7 +20,7 @@ 2007-01-30 Kenichi Handa * 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. @@ -27,8 +32,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