# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1081990904 0
# Node ID df801f738c09535f282232b0dc0d74f29234a672
# Parent  b62de47183941d13b7dff571814be6f29cb27b1e
(auto-compose-chars): Execute the main code in
condition-case.

diff -r b62de4718394 -r df801f738c09 lisp/composite.el
--- a/lisp/composite.el	Wed Apr 14 12:45:19 2004 +0000
+++ b/lisp/composite.el	Thu Apr 15 01:01:44 2004 +0000
@@ -431,12 +431,15 @@
   (save-buffer-state nil
     (save-excursion
       (save-match-data
-	(let ((start pos)
-	      (limit (if string (length string) (point-max)))
-	      ch func newpos)
-	  (setq limit (or (text-property-any pos limit 'auto-composed t string)
-			  limit)
-		pos (catch 'tag
+	(condition-case nil
+	    (let ((start pos)
+		  (limit (if string (length string) (point-max)))
+		  ch func newpos)
+	      (setq limit
+		    (or (text-property-any pos limit 'auto-composed t string)
+			limit)
+		    pos 
+		    (catch 'tag
 		      (if string
 			  (while (< pos limit)
 			    (setq ch (aref string pos))
@@ -459,7 +462,8 @@
 			      (setq pos newpos)
 			    (setq pos (1+ pos)))))
 		      limit))
-	  (put-text-property start pos 'auto-composed t string))))))
+	      (put-text-property start pos 'auto-composed t string))
+	  (error nil))))))
 
 (setq auto-composition-function 'auto-compose-chars)