comparison src/composite.c @ 102726:93ad3a5a4f75

Fix typo in comment.

102725:c08db43b04df

      for (i = 0; i < len; i++)
	if (NILP (LGSTRING_GLYPH (gstring, i)))
	  break;
      len = i;
    }
      
  copy = Fmake_vector (make_number (len + 2), Qnil);
  LGSTRING_SET_HEADER (copy, Fcopy_sequence (header));
  for (i = 0; i < len; i++)
    LGSTRING_SET_GLYPH (copy, i, Fcopy_sequence (LGSTRING_GLYPH (gstring, i)));
  i = hash_put (h, LGSTRING_HEADER (copy), copy, hash);

    LGSTRING_SET_GLYPH (gstring, i, Qnil);
}


/* Try to compose the characters at CHARPOS according to CFT_ELEMENT
   which is an element of composition-fucntion-table (which see).
   LIMIT limits the characters to compose.  STRING, if not nil, is a
   target string.  WIN is a window where the characters are being
   displayed.  */

static Lisp_Object

  int count = SPECPDL_INDEX ();
  FRAME_PTR f = XFRAME (win->frame);
  Lisp_Object pos = make_number (charpos);
  EMACS_INT pt = PT, pt_byte = PT_BYTE;
  int lookback;
  
  record_unwind_save_match_data ();
  for (lookback = -1; CONSP (cft_element); cft_element = XCDR (cft_element))
    {
      Lisp_Object elt = XCAR (cft_element);
      Lisp_Object re;

      if (! NILP (val))
	check_val = val, check = cur;
    }
  prev = cur;
  /* Now search forward.  */
 search_forward:  
  *gstring = Qnil;
  if (! NILP (check_val) || limit >= orig.pos)
    {
      if (NILP (check_val))
	cur = orig;

102726:93ad3a5a4f75

      for (i = 0; i < len; i++)
	if (NILP (LGSTRING_GLYPH (gstring, i)))
	  break;
      len = i;
    }

  copy = Fmake_vector (make_number (len + 2), Qnil);
  LGSTRING_SET_HEADER (copy, Fcopy_sequence (header));
  for (i = 0; i < len; i++)
    LGSTRING_SET_GLYPH (copy, i, Fcopy_sequence (LGSTRING_GLYPH (gstring, i)));
  i = hash_put (h, LGSTRING_HEADER (copy), copy, hash);

    LGSTRING_SET_GLYPH (gstring, i, Qnil);
}


/* Try to compose the characters at CHARPOS according to CFT_ELEMENT
   which is an element of composition-function-table (which see).
   LIMIT limits the characters to compose.  STRING, if not nil, is a
   target string.  WIN is a window where the characters are being
   displayed.  */

static Lisp_Object

  int count = SPECPDL_INDEX ();
  FRAME_PTR f = XFRAME (win->frame);
  Lisp_Object pos = make_number (charpos);
  EMACS_INT pt = PT, pt_byte = PT_BYTE;
  int lookback;

  record_unwind_save_match_data ();
  for (lookback = -1; CONSP (cft_element); cft_element = XCDR (cft_element))
    {
      Lisp_Object elt = XCAR (cft_element);
      Lisp_Object re;

      if (! NILP (val))
	check_val = val, check = cur;
    }
  prev = cur;
  /* Now search forward.  */
 search_forward:
  *gstring = Qnil;
  if (! NILP (check_val) || limit >= orig.pos)
    {
      if (NILP (check_val))
	cur = orig;