diff options
| author | Glenn Morris | 2019-01-07 11:51:23 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-01-07 11:51:23 -0800 |
| commit | 2c2bcc4ace55215f4ff6ea5026f100c209d8ad2e (patch) | |
| tree | cb3a7d0b50efe2e6412e410c7536377b507fe309 /src/window.c | |
| parent | 6ab2bf329f4165e6db4b0424c37d0da8e2c0e53e (diff) | |
| parent | 0ecff00bc19c0f8e1b2c0b552a7a686525377dad (diff) | |
| download | emacs-2c2bcc4ace55215f4ff6ea5026f100c209d8ad2e.tar.gz emacs-2c2bcc4ace55215f4ff6ea5026f100c209d8ad2e.zip | |
Merge from origin/emacs-26
0ecff00 Improve commentary in font.h
a058eda Fix definition of Qwindow_point_insertion_type (Bug#33871)
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index cad36c840ae..4a1db932ec3 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -7688,7 +7688,7 @@ on their symbols to be controlled by this variable. */); | |||
| 7688 | DEFVAR_LISP ("window-point-insertion-type", Vwindow_point_insertion_type, | 7688 | DEFVAR_LISP ("window-point-insertion-type", Vwindow_point_insertion_type, |
| 7689 | doc: /* Type of marker to use for `window-point'. */); | 7689 | doc: /* Type of marker to use for `window-point'. */); |
| 7690 | Vwindow_point_insertion_type = Qnil; | 7690 | Vwindow_point_insertion_type = Qnil; |
| 7691 | DEFSYM (Qwindow_point_insertion_type, "window_point_insertion_type"); | 7691 | DEFSYM (Qwindow_point_insertion_type, "window-point-insertion-type"); |
| 7692 | 7692 | ||
| 7693 | DEFVAR_LISP ("window-configuration-change-hook", | 7693 | DEFVAR_LISP ("window-configuration-change-hook", |
| 7694 | Vwindow_configuration_change_hook, | 7694 | Vwindow_configuration_change_hook, |