diff options
| author | Paul Eggert | 2016-08-16 13:16:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-08-16 13:17:11 -0700 |
| commit | 4b1b8dd80a287ec5e726e0672d94d5399c09b94c (patch) | |
| tree | fa37900984e980f16d2c2aa7d8be41f6c69e82b4 /src | |
| parent | c7119916dc958eeb8e6e2ef50d4a9f262db5be32 (diff) | |
| download | emacs-4b1b8dd80a287ec5e726e0672d94d5399c09b94c.tar.gz emacs-4b1b8dd80a287ec5e726e0672d94d5399c09b94c.zip | |
Omit substitute-command-keys code no longer needed
* src/doc.c (Fsubstitute_command_keys):
Remove duplicate initializations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc.c | 10 |
1 files changed, 7 insertions, 3 deletions
| @@ -743,10 +743,12 @@ Otherwise, return a new string. */) | |||
| 743 | if (NILP (string)) | 743 | if (NILP (string)) |
| 744 | return Qnil; | 744 | return Qnil; |
| 745 | 745 | ||
| 746 | /* If STRING contains non-ASCII unibyte data, process its | ||
| 747 | properly-encoded multibyte equivalent instead. This simplifies | ||
| 748 | the implementation and is OK since substitute-command-keys is | ||
| 749 | intended for use only on text strings. Keep STRING around, since | ||
| 750 | it will be returned if no changes occur. */ | ||
| 746 | Lisp_Object str = Fstring_make_multibyte (string); | 751 | Lisp_Object str = Fstring_make_multibyte (string); |
| 747 | tem = Qnil; | ||
| 748 | keymap = Qnil; | ||
| 749 | name = Qnil; | ||
| 750 | 752 | ||
| 751 | enum text_quoting_style quoting_style = text_quoting_style (); | 753 | enum text_quoting_style quoting_style = text_quoting_style (); |
| 752 | 754 | ||
| @@ -905,6 +907,8 @@ Otherwise, return a new string. */) | |||
| 905 | } | 907 | } |
| 906 | 908 | ||
| 907 | subst_string: | 909 | subst_string: |
| 910 | /* Convert non-ASCII unibyte data to properly-encoded multibyte, | ||
| 911 | for the same reason STRING was converted to STR. */ | ||
| 908 | tem = Fstring_make_multibyte (tem); | 912 | tem = Fstring_make_multibyte (tem); |
| 909 | start = SDATA (tem); | 913 | start = SDATA (tem); |
| 910 | length = SCHARS (tem); | 914 | length = SCHARS (tem); |