Mercurial > hg > xemacs-beta
comparison src/fns.c @ 14:9ee227acff29 r19-15b90
Import from CVS: tag r19-15b90
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:48:42 +0200 |
parents | 49a24b4fd526 |
children | 0293115a14e9 |
comparison
equal
deleted
inserted
replaced
13:13c6d0aaafe5 | 14:9ee227acff29 |
---|---|
286 if (SYMBOLP (s2)) | 286 if (SYMBOLP (s2)) |
287 XSETSTRING (s2, XSYMBOL (s2)->name); | 287 XSETSTRING (s2, XSYMBOL (s2)->name); |
288 CHECK_STRING (s1); | 288 CHECK_STRING (s1); |
289 CHECK_STRING (s2); | 289 CHECK_STRING (s2); |
290 | 290 |
291 len = string_length (XSTRING (s1)); | 291 len = XSTRING_LENGTH (s1); |
292 if (len != string_length (XSTRING (s2)) || | 292 if (len != XSTRING_LENGTH (s2) || |
293 memcmp (string_data (XSTRING (s1)), string_data (XSTRING (s2)), len)) | 293 memcmp (XSTRING_DATA (s1), XSTRING_DATA (s2), len)) |
294 return Qnil; | 294 return Qnil; |
295 return Qt; | 295 return Qt; |
296 } | 296 } |
297 | 297 |
298 | 298 |
694 #else | 694 #else |
695 thisleni = XINT (Flength (seq)); | 695 thisleni = XINT (Flength (seq)); |
696 #endif | 696 #endif |
697 } | 697 } |
698 if (STRINGP (seq)) | 698 if (STRINGP (seq)) |
699 string_source_ptr = string_data (XSTRING (seq)); | 699 string_source_ptr = XSTRING_DATA (seq); |
700 | 700 |
701 while (1) | 701 while (1) |
702 { | 702 { |
703 Lisp_Object elt; | 703 Lisp_Object elt; |
704 | 704 |
868 CHECK_STRING (string); | 868 CHECK_STRING (string); |
869 /* Historically, FROM could not be omitted. Whatever ... */ | 869 /* Historically, FROM could not be omitted. Whatever ... */ |
870 CHECK_INT (from); | 870 CHECK_INT (from); |
871 get_string_range_char (string, from, to, &ccfr, &ccto, | 871 get_string_range_char (string, from, to, &ccfr, &ccto, |
872 GB_HISTORICAL_STRING_BEHAVIOR); | 872 GB_HISTORICAL_STRING_BEHAVIOR); |
873 bfr = charcount_to_bytecount (string_data (XSTRING (string)), ccfr); | 873 bfr = charcount_to_bytecount (XSTRING_DATA (string), ccfr); |
874 bto = charcount_to_bytecount (string_data (XSTRING (string)), ccto); | 874 bto = charcount_to_bytecount (XSTRING_DATA (string), ccto); |
875 val = make_string (string_data (XSTRING (string)) + bfr, bto - bfr); | 875 val = make_string (XSTRING_DATA (string) + bfr, bto - bfr); |
876 /* Copy any applicable extent information into the new string: */ | 876 /* Copy any applicable extent information into the new string: */ |
877 copy_string_extents (val, string, 0, bfr, bto - bfr); | 877 copy_string_extents (val, string, 0, bfr, bto - bfr); |
878 return (val); | 878 return (val); |
879 } | 879 } |
880 | 880 |
2791 return (1); | 2791 return (1); |
2792 } | 2792 } |
2793 #endif /* !LRECORD_VECTOR */ | 2793 #endif /* !LRECORD_VECTOR */ |
2794 else if (STRINGP (o1)) | 2794 else if (STRINGP (o1)) |
2795 { | 2795 { |
2796 Bytecount len = string_length (XSTRING (o1)); | 2796 Bytecount len = XSTRING_LENGTH (o1); |
2797 if (len != string_length (XSTRING (o2))) | 2797 if (len != XSTRING_LENGTH (o2)) |
2798 return (0); | 2798 return (0); |
2799 if (memcmp (string_data (XSTRING (o1)), string_data (XSTRING (o2)), len)) | 2799 if (memcmp (XSTRING_DATA (o1), XSTRING_DATA (o2), len)) |
2800 return (0); | 2800 return (0); |
2801 return (1); | 2801 return (1); |
2802 } | 2802 } |
2803 else if (LRECORDP (o1)) | 2803 else if (LRECORDP (o1)) |
2804 { | 2804 { |