diff options
| author | Yuuki Harano | 2021-05-29 18:00:13 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2021-05-29 18:00:13 +0900 |
| commit | 67ae4b6271233559271f7a7158ba0e059b643ba5 (patch) | |
| tree | 9ceee3c99afb42b252ac11116cc31163acaaeb40 /src/buffer.c | |
| parent | 67a4c8b5ad9ebfb3fa2c7fae433aa6b6b5e92154 (diff) | |
| parent | e3fc16fd71a46990503a71b11a2ad592e99d9edb (diff) | |
| download | emacs-67ae4b6271233559271f7a7158ba0e059b643ba5.tar.gz emacs-67ae4b6271233559271f7a7158ba0e059b643ba5.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index df302db0e52..565577e75ae 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5681,10 +5681,10 @@ inserts one or more TAB characters, this variable will affect the | |||
| 5681 | indentation step as well, even if `indent-tabs-mode' is non-nil. */); | 5681 | indentation step as well, even if `indent-tabs-mode' is non-nil. */); |
| 5682 | 5682 | ||
| 5683 | DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, | 5683 | DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil, |
| 5684 | doc: /* Non-nil means display control chars with uparrow. | 5684 | doc: /* Non-nil means display control chars with uparrow `^'. |
| 5685 | A value of nil means use backslash and octal digits. | 5685 | A value of nil means use backslash `\\' and octal digits. |
| 5686 | This variable does not apply to characters whose display is specified | 5686 | This variable does not apply to characters whose display is specified in |
| 5687 | in the current display table (if there is one). */); | 5687 | the current display table (if there is one; see `standard-display-table'). */); |
| 5688 | 5688 | ||
| 5689 | DEFVAR_PER_BUFFER ("enable-multibyte-characters", | 5689 | DEFVAR_PER_BUFFER ("enable-multibyte-characters", |
| 5690 | &BVAR (current_buffer, enable_multibyte_characters), | 5690 | &BVAR (current_buffer, enable_multibyte_characters), |