Mercurial > emacs
changeset 90543:4a80a8a200ba
(auto-compose-current-font): New variable.
(auto-compose-chars): New arg FONT-OBJECT.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 24 Jul 2006 04:45:35 +0000 |
| parents | 2be199f501f8 |
| children | fa17948a98df |
| files | lisp/composite.el |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/composite.el Mon Jul 24 04:44:13 2006 +0000 +++ b/lisp/composite.el Mon Jul 24 04:45:35 2006 +0000 @@ -427,10 +427,14 @@ (put 'save-buffer-state 'lisp-indent-function 1) -(defun auto-compose-chars (pos string) +(defvar auto-compose-current-font nil + "The current font-object used for characters being composed automatically.") + +(defun auto-compose-chars (pos string font-object) "Compose characters after the buffer position POS. If STRING is non-nil, it is a string, and POS is an index into the string. In that case, compose characters in the string. +FONT-OBJECT is a font selected for the character at POS. This function is the default value of `auto-composition-function' (which see)." (save-buffer-state nil @@ -439,6 +443,7 @@ (condition-case nil (let ((start pos) (limit (if string (length string) (point-max))) + (auto-compose-current-font font-object) ch func newpos) (setq limit (or (text-property-any pos limit 'auto-composed t string)