diff options
| author | Kenichi Handa | 1997-02-27 07:49:24 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1997-02-27 07:49:24 +0000 |
| commit | a20aa7210cd4b0ef56b27b128493fb11feb7b3bd (patch) | |
| tree | 516234bab02fa316608bc08e0ae943444a03a0ec | |
| parent | c758053843c970f6728f5168bcd5c866b6a0d0e5 (diff) | |
| download | emacs-a20aa7210cd4b0ef56b27b128493fb11feb7b3bd.tar.gz emacs-a20aa7210cd4b0ef56b27b128493fb11feb7b3bd.zip | |
(describe_vector): Do not descibe deeper char-table if
enable-multibyte-characters is nil.
| -rw-r--r-- | src/keymap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index e6c79606eae..d300b7a6e4e 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2525,6 +2525,8 @@ describe_vector (vector, elt_prefix, elt_describer, | |||
| 2525 | int from, to; | 2525 | int from, to; |
| 2526 | /* The current depth of VECTOR if it is char-table. */ | 2526 | /* The current depth of VECTOR if it is char-table. */ |
| 2527 | int this_level; | 2527 | int this_level; |
| 2528 | /* Flag to tell if we should handle multibyte characters. */ | ||
| 2529 | int multibyte = !NILP (current_buffer->enable_multibyte_characters); | ||
| 2528 | /* Array of indices to access each level of char-table. | 2530 | /* Array of indices to access each level of char-table. |
| 2529 | The elements are charset, code1, and code2. */ | 2531 | The elements are charset, code1, and code2. */ |
| 2530 | int idx[3]; | 2532 | int idx[3]; |
| @@ -2676,7 +2678,7 @@ describe_vector (vector, elt_prefix, elt_describer, | |||
| 2676 | /* If we find a char-table within a char-table, | 2678 | /* If we find a char-table within a char-table, |
| 2677 | scan it recursively; it defines the details for | 2679 | scan it recursively; it defines the details for |
| 2678 | a character set or a portion of a character set. */ | 2680 | a character set or a portion of a character set. */ |
| 2679 | if (CHAR_TABLE_P (vector) && CHAR_TABLE_P (definition)) | 2681 | if (multibyte && CHAR_TABLE_P (vector) && CHAR_TABLE_P (definition)) |
| 2680 | { | 2682 | { |
| 2681 | if (this_level == 0 | 2683 | if (this_level == 0 |
| 2682 | && CHARSET_VALID_P (i)) | 2684 | && CHARSET_VALID_P (i)) |