diff options
| author | Miles Bader | 2006-11-21 08:56:38 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-11-21 08:56:38 +0000 |
| commit | eeb7eaa88482114822730380196f4e7a3c0870dd (patch) | |
| tree | e8c3861b628ad53c6b8f158b74d1be8bd8590aeb /src/fns.c | |
| parent | b15d6f4265b10fbc413caca03246feff9c87d53e (diff) | |
| parent | a98d0b8e8948293de119c4cdd7a8c79318ad82fa (diff) | |
| download | emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.tar.gz emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 20 |
1 files changed, 11 insertions, 9 deletions
| @@ -103,7 +103,7 @@ DEFUN ("random", Frandom, Srandom, 0, 1, 0, | |||
| 103 | All integers representable in Lisp are equally likely. | 103 | All integers representable in Lisp are equally likely. |
| 104 | On most systems, this is 29 bits' worth. | 104 | On most systems, this is 29 bits' worth. |
| 105 | With positive integer argument N, return random number in interval [0,N). | 105 | With positive integer argument N, return random number in interval [0,N). |
| 106 | With argument t, set the random number seed from the current time and pid. */) | 106 | With argument t, set the random number seed from the current time and pid. */) |
| 107 | (n) | 107 | (n) |
| 108 | Lisp_Object n; | 108 | Lisp_Object n; |
| 109 | { | 109 | { |
| @@ -140,7 +140,7 @@ DEFUN ("length", Flength, Slength, 1, 1, 0, | |||
| 140 | A byte-code function object is also allowed. | 140 | A byte-code function object is also allowed. |
| 141 | If the string contains multibyte characters, this is not necessarily | 141 | If the string contains multibyte characters, this is not necessarily |
| 142 | the number of bytes in the string; it is the number of characters. | 142 | the number of bytes in the string; it is the number of characters. |
| 143 | To get the number of bytes, use `string-bytes'. */) | 143 | To get the number of bytes, use `string-bytes'. */) |
| 144 | (sequence) | 144 | (sequence) |
| 145 | register Lisp_Object sequence; | 145 | register Lisp_Object sequence; |
| 146 | { | 146 | { |
| @@ -191,7 +191,7 @@ DEFUN ("safe-length", Fsafe_length, Ssafe_length, 1, 1, 0, | |||
| 191 | doc: /* Return the length of a list, but avoid error or infinite loop. | 191 | doc: /* Return the length of a list, but avoid error or infinite loop. |
| 192 | This function never gets an error. If LIST is not really a list, | 192 | This function never gets an error. If LIST is not really a list, |
| 193 | it returns 0. If LIST is circular, it returns a finite value | 193 | it returns 0. If LIST is circular, it returns a finite value |
| 194 | which is at least the number of distinct elements. */) | 194 | which is at least the number of distinct elements. */) |
| 195 | (list) | 195 | (list) |
| 196 | Lisp_Object list; | 196 | Lisp_Object list; |
| 197 | { | 197 | { |
| @@ -215,7 +215,7 @@ which is at least the number of distinct elements. */) | |||
| 215 | 215 | ||
| 216 | DEFUN ("string-bytes", Fstring_bytes, Sstring_bytes, 1, 1, 0, | 216 | DEFUN ("string-bytes", Fstring_bytes, Sstring_bytes, 1, 1, 0, |
| 217 | doc: /* Return the number of bytes in STRING. | 217 | doc: /* Return the number of bytes in STRING. |
| 218 | If STRING is multibyte, this may be greater than the length of STRING. */) | 218 | If STRING is multibyte, this may be greater than the length of STRING. */) |
| 219 | (string) | 219 | (string) |
| 220 | Lisp_Object string; | 220 | Lisp_Object string; |
| 221 | { | 221 | { |
| @@ -226,7 +226,7 @@ If STRING is multibyte, this may be greater than the length of STRING. */) | |||
| 226 | DEFUN ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0, | 226 | DEFUN ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0, |
| 227 | doc: /* Return t if two strings have identical contents. | 227 | doc: /* Return t if two strings have identical contents. |
| 228 | Case is significant, but text properties are ignored. | 228 | Case is significant, but text properties are ignored. |
| 229 | Symbols are also allowed; their print names are used instead. */) | 229 | Symbols are also allowed; their print names are used instead. */) |
| 230 | (s1, s2) | 230 | (s1, s2) |
| 231 | register Lisp_Object s1, s2; | 231 | register Lisp_Object s1, s2; |
| 232 | { | 232 | { |
| @@ -258,7 +258,7 @@ The value is t if the strings (or specified portions) match. | |||
| 258 | If string STR1 is less, the value is a negative number N; | 258 | If string STR1 is less, the value is a negative number N; |
| 259 | - 1 - N is the number of characters that match at the beginning. | 259 | - 1 - N is the number of characters that match at the beginning. |
| 260 | If string STR1 is greater, the value is a positive number N; | 260 | If string STR1 is greater, the value is a positive number N; |
| 261 | N - 1 is the number of characters that match at the beginning. */) | 261 | N - 1 is the number of characters that match at the beginning. */) |
| 262 | (str1, start1, end1, str2, start2, end2, ignore_case) | 262 | (str1, start1, end1, str2, start2, end2, ignore_case) |
| 263 | Lisp_Object str1, start1, end1, start2, str2, end2, ignore_case; | 263 | Lisp_Object str1, start1, end1, start2, str2, end2, ignore_case; |
| 264 | { | 264 | { |
| @@ -350,7 +350,7 @@ If string STR1 is greater, the value is a positive number N; | |||
| 350 | DEFUN ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0, | 350 | DEFUN ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0, |
| 351 | doc: /* Return t if first arg string is less than second in lexicographic order. | 351 | doc: /* Return t if first arg string is less than second in lexicographic order. |
| 352 | Case is significant. | 352 | Case is significant. |
| 353 | Symbols are also allowed; their print names are used instead. */) | 353 | Symbols are also allowed; their print names are used instead. */) |
| 354 | (s1, s2) | 354 | (s1, s2) |
| 355 | register Lisp_Object s1, s2; | 355 | register Lisp_Object s1, s2; |
| 356 | { | 356 | { |
| @@ -390,6 +390,8 @@ Symbols are also allowed; their print names are used instead. */) | |||
| 390 | the arguments for the invocations of this function, whereas it | 390 | the arguments for the invocations of this function, whereas it |
| 391 | expects these values on the stack. */ | 391 | expects these values on the stack. */ |
| 392 | static Lisp_Object concat () __attribute__((noinline)); | 392 | static Lisp_Object concat () __attribute__((noinline)); |
| 393 | #else /* !__GNUC__ */ | ||
| 394 | static Lisp_Object concat (); | ||
| 393 | #endif | 395 | #endif |
| 394 | 396 | ||
| 395 | /* ARGSUSED */ | 397 | /* ARGSUSED */ |
| @@ -464,7 +466,7 @@ usage: (vconcat &rest SEQUENCES) */) | |||
| 464 | DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0, | 466 | DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0, |
| 465 | doc: /* Return a copy of a list, vector, string or char-table. | 467 | doc: /* Return a copy of a list, vector, string or char-table. |
| 466 | The elements of a list or vector are not copied; they are shared | 468 | The elements of a list or vector are not copied; they are shared |
| 467 | with the original. */) | 469 | with the original. */) |
| 468 | (arg) | 470 | (arg) |
| 469 | Lisp_Object arg; | 471 | Lisp_Object arg; |
| 470 | { | 472 | { |
| @@ -1031,7 +1033,7 @@ DEFUN ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte, | |||
| 1031 | Multibyte character codes are converted to unibyte according to | 1033 | Multibyte character codes are converted to unibyte according to |
| 1032 | `nonascii-translation-table' or, if that is nil, `nonascii-insert-offset'. | 1034 | `nonascii-translation-table' or, if that is nil, `nonascii-insert-offset'. |
| 1033 | If the lookup in the translation table fails, this function takes just | 1035 | If the lookup in the translation table fails, this function takes just |
| 1034 | the low 8 bits of each character. */) | 1036 | the low 8 bits of each character. */) |
| 1035 | (string) | 1037 | (string) |
| 1036 | Lisp_Object string; | 1038 | Lisp_Object string; |
| 1037 | { | 1039 | { |