[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.5 emacs/lisp/composite.el:1.13.6.6
*** emacs/lisp/composite.el:1.13.6.5    Thu Oct 23 22:40:27 2003
--- emacs/lisp/composite.el     Sun Nov 23 02:33:48 2003
***************
*** 391,402 ****
         ,@body
         (unless modified
         (restore-buffer-modified-p nil))))
-   (put 'save-buffer-state 'lisp-indent-function 1)
    ;; Fixme: This makes bootstrapping fail with this error.
    ;;   Symbol's function definition is void: eval-defun
    ;;(def-edebug-spec save-buffer-state let)
    )
  
  (defun auto-compose-chars (pos string)
    "Compose characters after the buffer position POS.
  If STRING is non-nil, it is a string, and POS is an index into the string.
--- 391,403 ----
         ,@body
         (unless modified
         (restore-buffer-modified-p nil))))
    ;; Fixme: This makes bootstrapping fail with this error.
    ;;   Symbol's function definition is void: eval-defun
    ;;(def-edebug-spec save-buffer-state let)
    )
  
+ (put 'save-buffer-state 'lisp-indent-function 1)
+ 
  (defun auto-compose-chars (pos string)
    "Compose characters after the buffer position POS.
  If STRING is non-nil, it is a string, and POS is an index into the string.
***************
*** 404,441 ****
  
  This function is the default value of `auto-composition-function' (which 
see)."
    (save-buffer-state nil
!     (save-excursion
!       (save-restriction
!       (save-match-data
!         (let ((start pos)
!               (limit (next-single-property-change pos 'auto-composed string))
!               ch func newpos)
!           (if limit
!               (setq limit (1+ limit))
!             (setq limit (if string (length string) (point-max))))
!           (catch 'tag
!             (if string
!                 (while (< pos limit)
!                   (setq ch (aref string pos)
!                         pos (1+ pos))
!                   (if (= ch ?\n)
!                       (throw 'tag nil))
!                   (setq func (aref composition-function-table ch))
!                   (if (and (functionp func)
!                            (setq newpos (funcall func (1- pos) string))
!                            (> newpos pos))
!                       (setq pos newpos)))
!               (while (< pos limit)
!                 (setq ch (char-after pos)
!                       pos (1+ pos))
!                 (if (= ch ?\n)
!                     (throw 'tag nil))
!                 (setq func (aref composition-function-table ch))
!                 (if (and (functionp func)
!                          (setq newpos (funcall func (1- pos) string))
!                          (> newpos pos))
!                     (setq pos newpos)))))
!           (put-text-property start pos 'auto-composed t string)))))))
  
  (setq auto-composition-function 'auto-compose-chars)
  
--- 405,439 ----
  
  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))
!               (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))
!             (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)