# HG changeset patch # User Kenichi Handa # Date 964676262 0 # Node ID 5551289a9329fcaf1f77a6451dd67e62fa48db90 # Parent 6fe6da44867fb30ff4cf12d48463ee2d9f643ce2 (compose-chars-after): Preserve match data. diff -r 6fe6da44867f -r 5551289a9329 lisp/composite.el --- a/lisp/composite.el Thu Jul 27 05:37:13 2000 +0000 +++ b/lisp/composite.el Thu Jul 27 05:37:42 2000 +0000 @@ -338,17 +338,18 @@ (let ((tail (aref composition-function-table (char-after pos))) pattern func result) (when tail - (save-excursion - (while (and tail (not func)) - (setq pattern (car (car tail)) - func (cdr (car tail))) - (goto-char pos) - (if (if limit - (and (re-search-forward pattern limit t) - (= (match-beginning 0) pos)) - (looking-at pattern)) - (setq result (funcall func pos (match-end 0) pattern nil)) - (setq func nil tail (cdr tail)))))) + (save-match-data + (save-excursion + (while (and tail (not func)) + (setq pattern (car (car tail)) + func (cdr (car tail))) + (goto-char pos) + (if (if limit + (and (re-search-forward pattern limit t) + (= (match-beginning 0) pos)) + (looking-at pattern)) + (setq result (funcall func pos (match-end 0) pattern nil)) + (setq func nil tail (cdr tail))))))) result)) ;;;###autoload