diff options
| author | Richard M. Stallman | 1997-09-04 04:55:52 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-09-04 04:55:52 +0000 |
| commit | f44d27ceec74e942ab04c1bd36159e0e56b08691 (patch) | |
| tree | 6736f0d17915324d972152a399e8f10f7d4aad85 /src/coding.c | |
| parent | dc7619af353e24d52c5b4ed208a248cb5e3b53d8 (diff) | |
| download | emacs-f44d27ceec74e942ab04c1bd36159e0e56b08691.tar.gz emacs-f44d27ceec74e942ab04c1bd36159e0e56b08691.zip | |
(setup_coding_system, Ffind_operation_coding_system)
(Fdetect_coding_region, Fread_coding_system):
Don't initialize a Lisp_Object.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/coding.c b/src/coding.c index e91b763897e..d70d4b92770 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -2384,10 +2384,12 @@ setup_coding_system (coding_system, coding) | |||
| 2384 | case 2: | 2384 | case 2: |
| 2385 | coding->type = coding_type_iso2022; | 2385 | coding->type = coding_type_iso2022; |
| 2386 | { | 2386 | { |
| 2387 | Lisp_Object val = XVECTOR (coding_system)->contents[4]; | 2387 | Lisp_Object val; |
| 2388 | Lisp_Object *flags; | 2388 | Lisp_Object *flags; |
| 2389 | int i, charset, default_reg_bits = 0; | 2389 | int i, charset, default_reg_bits = 0; |
| 2390 | 2390 | ||
| 2391 | val = XVECTOR (coding_system)->contents[4]; | ||
| 2392 | |||
| 2391 | if (!VECTORP (val) || XVECTOR (val)->size != 32) | 2393 | if (!VECTORP (val) || XVECTOR (val)->size != 32) |
| 2392 | goto label_invalid_coding_system; | 2394 | goto label_invalid_coding_system; |
| 2393 | 2395 | ||
| @@ -3114,8 +3116,9 @@ DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 1, 0, | |||
| 3114 | (prompt) | 3116 | (prompt) |
| 3115 | Lisp_Object prompt; | 3117 | Lisp_Object prompt; |
| 3116 | { | 3118 | { |
| 3117 | Lisp_Object val = Fcompleting_read (prompt, Vobarray, Qcoding_system_p, | 3119 | Lisp_Object val; |
| 3118 | Qt, Qnil, Qnil, Qnil, Qnil); | 3120 | val = Fcompleting_read (prompt, Vobarray, Qcoding_system_p, |
| 3121 | Qt, Qnil, Qnil, Qnil, Qnil); | ||
| 3119 | return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil)); | 3122 | return (XSTRING (val)->size == 0 ? Qnil : Fintern (val, Qnil)); |
| 3120 | } | 3123 | } |
| 3121 | 3124 | ||
| @@ -3161,7 +3164,8 @@ If only ASCII characters are found, it returns `undecided'\n\ | |||
| 3161 | if (eol_type != CODING_EOL_UNDECIDED | 3164 | if (eol_type != CODING_EOL_UNDECIDED |
| 3162 | && eol_type != CODING_EOL_INCONSISTENT) | 3165 | && eol_type != CODING_EOL_INCONSISTENT) |
| 3163 | { | 3166 | { |
| 3164 | Lisp_Object val2 = Fget (Qundecided, Qeol_type); | 3167 | Lisp_Object val2; |
| 3168 | val2 = Fget (Qundecided, Qeol_type); | ||
| 3165 | if (VECTORP (val2)) | 3169 | if (VECTORP (val2)) |
| 3166 | val = XVECTOR (val2)->contents[eol_type]; | 3170 | val = XVECTOR (val2)->contents[eol_type]; |
| 3167 | } | 3171 | } |
| @@ -3206,7 +3210,8 @@ If only ASCII characters are found, it returns `undecided'\n\ | |||
| 3206 | val = Fcons (XCONS (val2)->car, val); | 3210 | val = Fcons (XCONS (val2)->car, val); |
| 3207 | else | 3211 | else |
| 3208 | { | 3212 | { |
| 3209 | Lisp_Object val3 = Fget (XCONS (val2)->car, Qeol_type); | 3213 | Lisp_Object val3; |
| 3214 | val3 = Fget (XCONS (val2)->car, Qeol_type); | ||
| 3210 | if (VECTORP (val3)) | 3215 | if (VECTORP (val3)) |
| 3211 | val = Fcons (XVECTOR (val3)->contents[eol_type], val); | 3216 | val = Fcons (XVECTOR (val3)->contents[eol_type], val); |
| 3212 | else | 3217 | else |
| @@ -3768,7 +3773,8 @@ which is a list of all the arguments given to this function.") | |||
| 3768 | 3773 | ||
| 3769 | for (; CONSP (chain); chain = XCONS (chain)->cdr) | 3774 | for (; CONSP (chain); chain = XCONS (chain)->cdr) |
| 3770 | { | 3775 | { |
| 3771 | Lisp_Object elt = XCONS (chain)->car; | 3776 | Lisp_Object elt; |
| 3777 | elt = XCONS (chain)->car; | ||
| 3772 | 3778 | ||
| 3773 | if (CONSP (elt) | 3779 | if (CONSP (elt) |
| 3774 | && ((STRINGP (target) | 3780 | && ((STRINGP (target) |