diff options
| author | Kenichi Handa | 2003-11-26 11:54:07 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-11-26 11:54:07 +0000 |
| commit | 8a0e01e2a6da3180447bd3c707e3933951461672 (patch) | |
| tree | 18944886104bf3dc155a1f3fe0651c100902e493 | |
| parent | 6ec5974c1841ced87d953da6968bb161e8243177 (diff) | |
| download | emacs-8a0e01e2a6da3180447bd3c707e3933951461672.tar.gz emacs-8a0e01e2a6da3180447bd3c707e3933951461672.zip | |
(auto-compose-chars): Fix previous change.
| -rw-r--r-- | lisp/composite.el | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 4f8f1cb4ce2..0b91656d477 100644 --- a/lisp/composite.el +++ b/lisp/composite.el | |||
| @@ -411,29 +411,30 @@ This function is the default value of `auto-composition-function' (which see)." | |||
| 411 | (limit (if string (length string) (point-max))) | 411 | (limit (if string (length string) (point-max))) |
| 412 | ch func newpos) | 412 | ch func newpos) |
| 413 | (setq limit (or (text-property-any pos limit 'auto-composed t string) | 413 | (setq limit (or (text-property-any pos limit 'auto-composed t string) |
| 414 | limit)) | 414 | limit) |
| 415 | (catch 'tag | 415 | pos (catch 'tag |
| 416 | (if string | 416 | (if string |
| 417 | (while (< pos limit) | 417 | (while (< pos limit) |
| 418 | (setq ch (aref string pos)) | 418 | (setq ch (aref string pos)) |
| 419 | (if (= ch ?\n) | 419 | (if (= ch ?\n) |
| 420 | (throw 'tag nil)) | 420 | (throw 'tag (1+ pos))) |
| 421 | (setq func (aref composition-function-table ch)) | 421 | (setq func (aref composition-function-table ch)) |
| 422 | (if (and (functionp func) | 422 | (if (and (functionp func) |
| 423 | (setq newpos (funcall func pos string)) | 423 | (setq newpos (funcall func pos string)) |
| 424 | (> newpos pos)) | 424 | (> newpos pos)) |
| 425 | (setq pos newpos) | 425 | (setq pos newpos) |
| 426 | (setq pos (1+ pos)))) | 426 | (setq pos (1+ pos)))) |
| 427 | (while (< pos limit) | 427 | (while (< pos limit) |
| 428 | (setq ch (char-after pos)) | 428 | (setq ch (char-after pos)) |
| 429 | (if (= ch ?\n) | 429 | (if (= ch ?\n) |
| 430 | (throw 'tag nil)) | 430 | (throw 'tag (1+ pos))) |
| 431 | (setq func (aref composition-function-table ch)) | 431 | (setq func (aref composition-function-table ch)) |
| 432 | (if (and (functionp func) | 432 | (if (and (functionp func) |
| 433 | (setq newpos (funcall func pos string)) | 433 | (setq newpos (funcall func pos string)) |
| 434 | (> newpos pos)) | 434 | (> newpos pos)) |
| 435 | (setq pos newpos) | 435 | (setq pos newpos) |
| 436 | (setq pos (1+ pos)))))) | 436 | (setq pos (1+ pos))))) |
| 437 | limit)) | ||
| 437 | (put-text-property start pos 'auto-composed t string)))))) | 438 | (put-text-property start pos 'auto-composed t string)))))) |
| 438 | 439 | ||
| 439 | (setq auto-composition-function 'auto-compose-chars) | 440 | (setq auto-composition-function 'auto-compose-chars) |