/[emacs]/emacs/src/composite.c
ViewVC logotype

Diff of /emacs/src/composite.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by lektu, Thu Jul 11 14:09:42 2002 UTC revision 1.21 by raeburn, Mon Jul 15 00:00:36 2002 UTC
# Line 615  compose_chars_in_text (start, end, strin Line 615  compose_chars_in_text (start, end, strin
615        count = SPECPDL_INDEX ();        count = SPECPDL_INDEX ();
616        GCPRO1 (string);        GCPRO1 (string);
617        stop = end;        stop = end;
618        ptr = XSTRING (string)->data + string_char_to_byte (string, start);        ptr = SDATA (string) + string_char_to_byte (string, start);
619        pend = ptr + STRING_BYTES (XSTRING (string));        pend = ptr + SBYTES (string);
620      }      }
621    else    else
622      {      {
# Line 650  compose_chars_in_text (start, end, strin Line 650  compose_chars_in_text (start, end, strin
650              break;              break;
651            stop = end;            stop = end;
652            if (STRINGP (string))            if (STRINGP (string))
653              ptr = XSTRING (string)->data + string_char_to_byte (string, start);              ptr = SDATA (string) + string_char_to_byte (string, start);
654            else            else
655              ptr = CHAR_POS_ADDR (start);              ptr = CHAR_POS_ADDR (start);
656          }          }
# Line 680  compose_chars_in_text (start, end, strin Line 680  compose_chars_in_text (start, end, strin
680                      {                      {
681                        start += XINT (val);                        start += XINT (val);
682                        if (STRINGP (string))                        if (STRINGP (string))
683                          ptr = XSTRING (string)->data + string_char_to_byte (string, start);                          ptr = SDATA (string) + string_char_to_byte (string, start);
684                        else                        else
685                          ptr = CHAR_POS_ADDR (start);                          ptr = CHAR_POS_ADDR (start);
686                      }                      }
# Line 746  for the composition.   See `compose-stri Line 746  for the composition.   See `compose-stri
746    
747    if (XINT (start) < 0 ||    if (XINT (start) < 0 ||
748        XINT (start) > XINT (end)        XINT (start) > XINT (end)
749        || XINT (end) > XSTRING (string)->size)        || XINT (end) > SCHARS (string))
750      args_out_of_range (start, end);      args_out_of_range (start, end);
751    
752    compose_text (XINT (start), XINT (end), components, mod_func, string);    compose_text (XINT (start), XINT (end), components, mod_func, string);
# Line 779  See `find-composition' for more detail. Line 779  See `find-composition' for more detail.
779    if (!NILP (string))    if (!NILP (string))
780      {      {
781        CHECK_STRING (string);        CHECK_STRING (string);
782        if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)        if (XINT (pos) < 0 || XINT (pos) > SCHARS (string))
783          args_out_of_range (string, pos);          args_out_of_range (string, pos);
784      }      }
785    else    else

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26