diff options
| author | Richard M. Stallman | 2005-05-02 17:08:44 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-05-02 17:08:44 +0000 |
| commit | 7695b656d9262e9ccc402c2342ba595358b7b665 (patch) | |
| tree | ae6542ae1059c1e1004fd28410d633cac234103b | |
| parent | 4006261607a72d19886ae8e47fdfb700958a426e (diff) | |
| download | emacs-7695b656d9262e9ccc402c2342ba595358b7b665.tar.gz emacs-7695b656d9262e9ccc402c2342ba595358b7b665.zip | |
(Vcursor_in_non_selected_windows)
(Qcursor_in_non_selected_windows): Vars deleted.
(syms_of_xdisp): Don't initialize them.
(get_window_cursor_type): Use cursor_in_non_selected_windows buffer slot.
| -rw-r--r-- | src/xdisp.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 5ea68aff049..56c686aed47 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -621,12 +621,6 @@ Lisp_Object Qmessage_truncate_lines; | |||
| 621 | 621 | ||
| 622 | static int message_cleared_p; | 622 | static int message_cleared_p; |
| 623 | 623 | ||
| 624 | /* Non-zero means we want a hollow cursor in windows that are not | ||
| 625 | selected. Zero means there's no cursor in such windows. */ | ||
| 626 | |||
| 627 | Lisp_Object Vcursor_in_non_selected_windows; | ||
| 628 | Lisp_Object Qcursor_in_non_selected_windows; | ||
| 629 | |||
| 630 | /* How to blink the default frame cursor off. */ | 624 | /* How to blink the default frame cursor off. */ |
| 631 | Lisp_Object Vblink_cursor_alist; | 625 | Lisp_Object Vblink_cursor_alist; |
| 632 | 626 | ||
| @@ -20133,7 +20127,7 @@ get_window_cursor_type (w, glyph, width, active_cursor) | |||
| 20133 | /* Use cursor-in-non-selected-windows for non-selected window or frame. */ | 20127 | /* Use cursor-in-non-selected-windows for non-selected window or frame. */ |
| 20134 | if (non_selected) | 20128 | if (non_selected) |
| 20135 | { | 20129 | { |
| 20136 | alt_cursor = Fbuffer_local_value (Qcursor_in_non_selected_windows, w->buffer); | 20130 | alt_cursor = XBUFFER (w->buffer)->cursor_in_non_selected_windows; |
| 20137 | return get_specified_cursor_type (alt_cursor, width); | 20131 | return get_specified_cursor_type (alt_cursor, width); |
| 20138 | } | 20132 | } |
| 20139 | 20133 | ||
| @@ -22497,8 +22491,6 @@ syms_of_xdisp () | |||
| 22497 | staticpro (&Qpoly); | 22491 | staticpro (&Qpoly); |
| 22498 | Qmessage_truncate_lines = intern ("message-truncate-lines"); | 22492 | Qmessage_truncate_lines = intern ("message-truncate-lines"); |
| 22499 | staticpro (&Qmessage_truncate_lines); | 22493 | staticpro (&Qmessage_truncate_lines); |
| 22500 | Qcursor_in_non_selected_windows = intern ("cursor-in-non-selected-windows"); | ||
| 22501 | staticpro (&Qcursor_in_non_selected_windows); | ||
| 22502 | Qgrow_only = intern ("grow-only"); | 22494 | Qgrow_only = intern ("grow-only"); |
| 22503 | staticpro (&Qgrow_only); | 22495 | staticpro (&Qgrow_only); |
| 22504 | Qinhibit_menubar_update = intern ("inhibit-menubar-update"); | 22496 | Qinhibit_menubar_update = intern ("inhibit-menubar-update"); |
| @@ -22792,12 +22784,6 @@ only, until their display becomes empty, at which point the windows | |||
| 22792 | go back to their normal size. */); | 22784 | go back to their normal size. */); |
| 22793 | Vresize_mini_windows = Qgrow_only; | 22785 | Vresize_mini_windows = Qgrow_only; |
| 22794 | 22786 | ||
| 22795 | DEFVAR_LISP ("cursor-in-non-selected-windows", | ||
| 22796 | &Vcursor_in_non_selected_windows, | ||
| 22797 | doc: /* *Cursor type to display in non-selected windows. | ||
| 22798 | t means to use hollow box cursor. See `cursor-type' for other values. */); | ||
| 22799 | Vcursor_in_non_selected_windows = Qt; | ||
| 22800 | |||
| 22801 | DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist, | 22787 | DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist, |
| 22802 | doc: /* Alist specifying how to blink the cursor off. | 22788 | doc: /* Alist specifying how to blink the cursor off. |
| 22803 | Each element has the form (ON-STATE . OFF-STATE). Whenever the | 22789 | Each element has the form (ON-STATE . OFF-STATE). Whenever the |