Mercurial > emacs
comparison src/keymap.c @ 40656:cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
| author | Pavel Jan?k <Pavel@Janik.cz> |
|---|---|
| date | Fri, 02 Nov 2001 20:46:55 +0000 |
| parents | 1248b61b7baf |
| children | 97673fa0eaa7 |
comparison
equal
deleted
inserted
replaced
| 40655:45453187feeb | 40656:cdfd4d09b79a |
|---|---|
| 1956 || (c2 >= 0 && c2 < 32))) | 1956 || (c2 >= 0 && c2 < 32))) |
| 1957 { | 1957 { |
| 1958 /* Handle a generic character. */ | 1958 /* Handle a generic character. */ |
| 1959 Lisp_Object name; | 1959 Lisp_Object name; |
| 1960 name = CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX); | 1960 name = CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX); |
| 1961 CHECK_STRING (name, 0); | 1961 CHECK_STRING (name); |
| 1962 return concat2 (build_string ("Character set "), name); | 1962 return concat2 (build_string ("Character set "), name); |
| 1963 } | 1963 } |
| 1964 else | 1964 else |
| 1965 { | 1965 { |
| 1966 char tem[KEY_DESCRIPTION_SIZE], *end; | 1966 char tem[KEY_DESCRIPTION_SIZE], *end; |
| 2035 { | 2035 { |
| 2036 /* Currently MAX_MULTIBYTE_LENGTH is 4 (< 6). */ | 2036 /* Currently MAX_MULTIBYTE_LENGTH is 4 (< 6). */ |
| 2037 unsigned char str[6]; | 2037 unsigned char str[6]; |
| 2038 int c; | 2038 int c; |
| 2039 | 2039 |
| 2040 CHECK_NUMBER (character, 0); | 2040 CHECK_NUMBER (character); |
| 2041 | 2041 |
| 2042 c = XINT (character); | 2042 c = XINT (character); |
| 2043 if (!SINGLE_BYTE_CHAR_P (c)) | 2043 if (!SINGLE_BYTE_CHAR_P (c)) |
| 2044 { | 2044 { |
| 2045 int len = CHAR_STRING (c, str); | 2045 int len = CHAR_STRING (c, str); |
| 2939 Lisp_Object vector; | 2939 Lisp_Object vector; |
| 2940 { | 2940 { |
| 2941 int count = specpdl_ptr - specpdl; | 2941 int count = specpdl_ptr - specpdl; |
| 2942 | 2942 |
| 2943 specbind (Qstandard_output, Fcurrent_buffer ()); | 2943 specbind (Qstandard_output, Fcurrent_buffer ()); |
| 2944 CHECK_VECTOR_OR_CHAR_TABLE (vector, 0); | 2944 CHECK_VECTOR_OR_CHAR_TABLE (vector); |
| 2945 describe_vector (vector, Qnil, describe_vector_princ, 0, | 2945 describe_vector (vector, Qnil, describe_vector_princ, 0, |
| 2946 Qnil, Qnil, (int *)0, 0); | 2946 Qnil, Qnil, (int *)0, 0); |
| 2947 | 2947 |
| 2948 return unbind_to (count, Qnil); | 2948 return unbind_to (count, Qnil); |
| 2949 } | 2949 } |
| 3304 Return list of symbols found.") | 3304 Return list of symbols found.") |
| 3305 (regexp, predicate) | 3305 (regexp, predicate) |
| 3306 Lisp_Object regexp, predicate; | 3306 Lisp_Object regexp, predicate; |
| 3307 { | 3307 { |
| 3308 struct gcpro gcpro1, gcpro2; | 3308 struct gcpro gcpro1, gcpro2; |
| 3309 CHECK_STRING (regexp, 0); | 3309 CHECK_STRING (regexp); |
| 3310 apropos_predicate = predicate; | 3310 apropos_predicate = predicate; |
| 3311 GCPRO2 (apropos_predicate, apropos_accumulate); | 3311 GCPRO2 (apropos_predicate, apropos_accumulate); |
| 3312 apropos_accumulate = Qnil; | 3312 apropos_accumulate = Qnil; |
| 3313 map_obarray (Vobarray, apropos_accum, regexp); | 3313 map_obarray (Vobarray, apropos_accum, regexp); |
| 3314 apropos_accumulate = Fsort (apropos_accumulate, Qstring_lessp); | 3314 apropos_accumulate = Fsort (apropos_accumulate, Qstring_lessp); |
