# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1153716335 0
# Node ID 4a80a8a200baa655d04c37ad7bc0b9f8db13a373
# Parent  2be199f501f802edc98dcc00a0b182e76f8dc68f
(auto-compose-current-font): New variable.
(auto-compose-chars): New arg FONT-OBJECT.

diff -r 2be199f501f8 -r 4a80a8a200ba lisp/composite.el
--- 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)