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

[Dave Love]

Index: emacs/lisp/composite.el
diff -c emacs/lisp/composite.el:1.13.6.1 emacs/lisp/composite.el:1.13.6.2
*** emacs/lisp/composite.el:1.13.6.1    Mon Sep  8 08:53:36 2003
--- emacs/lisp/composite.el     Thu Sep 11 05:24:56 2003
***************
*** 40,47 ****
      (mid-left . 3) (mid-center . 10) (mid-right . 5))
    "Alist of symbols vs integer codes of glyph reference points.
  A glyph reference point symbol is to be used to specify a composition
! rule in COMPONENTS argument to such functions as `compose-region' and
! `make-composition'.
  
  Meanings of glyph reference point codes are as follows:
  
--- 40,46 ----
      (mid-left . 3) (mid-center . 10) (mid-right . 5))
    "Alist of symbols vs integer codes of glyph reference points.
  A glyph reference point symbol is to be used to specify a composition
! rule in COMPONENTS argument to such functions as `compose-region'.
  
  Meanings of glyph reference point codes are as follows:
  
***************
*** 164,172 ****
  First two arguments START and END are positions (integers or markers)
  specifying the region.
  
! Optional 3rd argument COMPONENTS, if non-nil, is a character or a
! sequence (vector, list, or string) of integers.  In this case,
! characters are composed not relatively but according to COMPONENTS.
  
  If it is a character, it is an alternate character to display instead
  of the text in the region.
--- 163,171 ----
  First two arguments START and END are positions (integers or markers)
  specifying the region.
  
! Optional 3rd argument COMPONENTS, if non-nil, is a character, a string
! Optional 3rd argument COMPONENTS, if non-nil, is a character, a string
! or a vector or list of integers and rules.
  
  If it is a character, it is an alternate character to display instead
  of the text in the region.
***************
*** 315,321 ****
  Optional 2nd arg LIMIT, if non-nil, limits the matching of text.
  
  Optional 3rd arg OBJECT, if non-nil, is a string that contains the
! text to compose.  In that case, POS and LIMIT index to the string.
  
  This function is the default value of `compose-chars-after-function'."
    (let ((tail (aref composition-function-table (char-after pos)))
--- 314,320 ----
  Optional 2nd arg LIMIT, if non-nil, limits the matching of text.
  
  Optional 3rd arg OBJECT, if non-nil, is a string that contains the
! text to compose.  In that case, POS and LIMIT index into the string.
  
  This function is the default value of `compose-chars-after-function'."
    (let ((tail (aref composition-function-table (char-after pos)))
***************
*** 373,379 ****
  function has to compose a character at POS with surrounding characters
  in the current buffer.
  
! Otherwise, STRING is a string, and POS is an index to the string.  In
  this case, the function has to compose a character at POS with
  surrounding characters in the string.
  
--- 372,378 ----
  function has to compose a character at POS with surrounding characters
  in the current buffer.
  
! Otherwise, STRING is a string, and POS is an index into the string.  In
  this case, the function has to compose a character at POS with
  surrounding characters in the string.
  
***************
*** 381,390 ****
  
  ;; Copied from font-lock.el.
  (eval-when-compile
-   ;;
-   ;; We don't do this at the top-level as we only use non-autoloaded macros.
-   (require 'cl)
-   ;;
    ;; Borrowed from lazy-lock.el.
    ;; We use this to preserve or protect things when modifying text properties.
    (defmacro save-buffer-state (varlist &rest body)
--- 380,385 ----
***************
*** 398,414 ****
         (unless modified
         (restore-buffer-modified-p nil))))
    (put 'save-buffer-state 'lisp-indent-function 1)
!   ;; Fixme: This makes bootstrapping fails by this error.
    ;;   Symbol's function definition is void: eval-defun
    ;;(def-edebug-spec save-buffer-state let)
    )
  
  (defvar auto-composition-chunk-size 500
!   "*Automatic composition chunks of this many characters, or smaller.")
  
  (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 to the string.
  In that case, compose characters in the string.
  
  This function is the default value of `auto-composition-function' (which 
see)."
--- 393,409 ----
         (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)
    )
  
  (defvar auto-composition-chunk-size 500
!   "*Automatic composition uses chunks of this many characters, or smaller.")
  
  (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.
  In that case, compose characters in the string.
  
  This function is the default value of `auto-composition-function' (which 
see)."
***************
*** 430,436 ****
                        (or (< pos limit)
                            (/= ch ?\n)))
              (setq func (aref composition-function-table ch))
!             (if (fboundp func)
                  (setq newpos (funcall func pos string)
                        pos (if (and (integerp newpos) (> newpos pos))
                                newpos
--- 425,431 ----
                        (or (< pos limit)
                            (/= ch ?\n)))
              (setq func (aref composition-function-table ch))
!             (if (functionp func)
                  (setq newpos (funcall func pos string)
                        pos (if (and (integerp newpos) (> newpos pos))
                                newpos