(auto-compose-chars): Execute the main code in

condition-case.
This commit is contained in:
Kenichi Handa 2004-04-15 01:01:44 +00:00
parent 7bd9c08341
commit 1b9d98764d

View file

@ -431,12 +431,15 @@ This function is the default value of `auto-composition-function' (which see)."
(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 @@ This function is the default value of `auto-composition-function' (which see)."
(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)