Mercurial > emacs
changeset 89664:5548dd3d1a7c
(auto-compose-chars): Fix previous change.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 26 Nov 2003 11:54:07 +0000 |
| parents | 64e5fb6a6816 |
| children | 9010cefe8d29 |
| files | lisp/composite.el |
| diffstat | 1 files changed, 24 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/composite.el Wed Nov 26 11:53:52 2003 +0000 +++ b/lisp/composite.el Wed Nov 26 11:54:07 2003 +0000 @@ -411,29 +411,30 @@ (limit (if string (length string) (point-max))) ch func newpos) (setq limit (or (text-property-any pos limit 'auto-composed t string) - limit)) - (catch 'tag - (if string - (while (< pos limit) - (setq ch (aref string pos)) - (if (= ch ?\n) - (throw 'tag nil)) - (setq func (aref composition-function-table ch)) - (if (and (functionp func) - (setq newpos (funcall func pos string)) - (> newpos pos)) - (setq pos newpos) - (setq pos (1+ pos)))) - (while (< pos limit) - (setq ch (char-after pos)) - (if (= ch ?\n) - (throw 'tag nil)) - (setq func (aref composition-function-table ch)) - (if (and (functionp func) - (setq newpos (funcall func pos string)) - (> newpos pos)) - (setq pos newpos) - (setq pos (1+ pos)))))) + limit) + pos (catch 'tag + (if string + (while (< pos limit) + (setq ch (aref string pos)) + (if (= ch ?\n) + (throw 'tag (1+ pos))) + (setq func (aref composition-function-table ch)) + (if (and (functionp func) + (setq newpos (funcall func pos string)) + (> newpos pos)) + (setq pos newpos) + (setq pos (1+ pos)))) + (while (< pos limit) + (setq ch (char-after pos)) + (if (= ch ?\n) + (throw 'tag (1+ pos))) + (setq func (aref composition-function-table ch)) + (if (and (functionp func) + (setq newpos (funcall func pos string)) + (> newpos pos)) + (setq pos newpos) + (setq pos (1+ pos))))) + limit)) (put-text-property start pos 'auto-composed t string)))))) (setq auto-composition-function 'auto-compose-chars)