From 5bb686535d2ed55f6311a421490c1ea7be64ed57 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 24 Jul 2006 04:45:35 +0000 Subject: [PATCH] (auto-compose-current-font): New variable. (auto-compose-chars): New arg FONT-OBJECT. --- lisp/composite.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/composite.el b/lisp/composite.el index b9368d54274..ddf56d35434 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -427,10 +427,14 @@ See also the command `toggle-auto-composition'.") (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 @@ This function is the default value of `auto-composition-function' (which see)." (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) -- 2.39.5