[Emacs-diffs] Changes to emacs/lisp/composite.el [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/lisp/composite.el
diff -c emacs/lisp/composite.el:1.13.6.6 emacs/lisp/composite.el:1.13.6.7
*** emacs/lisp/composite.el:1.13.6.6    Sun Nov 23 02:33:48 2003
--- emacs/lisp/composite.el     Tue Nov 25 03:07:41 2003
***************
*** 405,420 ****
  
  This function is the default value of `auto-composition-function' (which 
see)."
    (save-buffer-state nil
!     (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))
!       (catch 'tag
!         (if string
              (while (< pos limit)
!               (setq ch (aref string pos))
                (if (= ch ?\n)
                    (throw 'tag nil))
                (setq func (aref composition-function-table ch))
--- 405,431 ----
  
  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))
!         (catch 'tag
!           (if string
!               (while (< pos limit)
!                 (setq ch (aref string pos))
!                 (if (= ch ?\n)
!                     (throw 'tag nil))
!                 (setq func (aref composition-function-table ch))
!                 (if (and (functionp func)
!                          (setq newpos (funcall func pos string))
!                          (> newpos pos))
!                     (setq pos newpos)
!                   (setq pos (1+ pos))))
              (while (< pos limit)
!               (setq ch (char-after pos))
                (if (= ch ?\n)
                    (throw 'tag nil))
                (setq func (aref composition-function-table ch))
***************
*** 422,439 ****
                         (setq newpos (funcall func pos string))
                         (> newpos pos))
                    (setq pos newpos)
!                 (setq pos (1+ pos))))
!           (while (< pos limit)
!             (setq ch (char-after pos))
!             (if (= ch ?\n)
!                 (throw 'tag nil))
!             (setq func (aref composition-function-table ch))
!             (if (and (functionp func)
!                      (setq newpos (funcall func pos string))
!                      (> newpos pos))
!                 (setq pos newpos)
!               (setq pos (1+ pos))))))
!       (put-text-property start pos 'auto-composed t string)))))
  
  (setq auto-composition-function 'auto-compose-chars)
  
--- 433,440 ----
                         (setq newpos (funcall func pos string))
                         (> newpos pos))
                    (setq pos newpos)
!                 (setq pos (1+ pos))))))
!         (put-text-property start pos 'auto-composed t string))))))
  
  (setq auto-composition-function 'auto-compose-chars)