aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 0fa379dc5d7..fa63e6ffc5a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -537,13 +537,6 @@ static int message_cleared_p;
537Lisp_Object Vcursor_in_non_selected_windows; 537Lisp_Object Vcursor_in_non_selected_windows;
538Lisp_Object Qcursor_in_non_selected_windows; 538Lisp_Object Qcursor_in_non_selected_windows;
539 539
540/* Specifies the desired cursor-type to use to show the blinking
541 cursor off state and cursor shown in non-selected windows.
542 t means to use the default. */
543
544Lisp_Object Valternate_cursor_type;
545Lisp_Object Qalternate_cursor_type;
546
547/* How to blink the default frame cursor off. */ 540/* How to blink the default frame cursor off. */
548Lisp_Object Vblink_cursor_alist; 541Lisp_Object Vblink_cursor_alist;
549 542
@@ -15362,15 +15355,8 @@ get_window_cursor_type (w, width)
15362 15355
15363 /* Cursor is blinked off, so determine how to "toggle" it. */ 15356 /* Cursor is blinked off, so determine how to "toggle" it. */
15364 15357
15365 /* First try to use alternate-cursor-type, unless it is t. */ 15358 /* First look for an entry matching the buffer's cursor-type in blink-cursor-alist. */
15366 alt_cursor = Fbuffer_local_value (Qalternate_cursor_type, w->buffer); 15359 if ((alt_cursor = Fassoc (b->cursor_type, Vblink_cursor_alist), !NILP (alt_cursor)))
15367 if (!EQ (alt_cursor, Qt))
15368 return get_specified_cursor_type (alt_cursor, width);
15369
15370 /* Then unless buffer's cursor-type is t (use default),
15371 look for an entry matching normal cursor in blink-cursor-alist. */
15372 if (!EQ (b->cursor_type, Qt) &&
15373 (alt_cursor = Fassoc (b->cursor_type, Vblink_cursor_alist), !NILP (alt_cursor)))
15374 return get_specified_cursor_type (XCDR (alt_cursor), width); 15360 return get_specified_cursor_type (XCDR (alt_cursor), width);
15375 15361
15376 /* Then see if frame has specified a specific blink off cursor type. */ 15362 /* Then see if frame has specified a specific blink off cursor type. */
@@ -15499,8 +15485,6 @@ syms_of_xdisp ()
15499 staticpro (&Qmessage_truncate_lines); 15485 staticpro (&Qmessage_truncate_lines);
15500 Qcursor_in_non_selected_windows = intern ("cursor-in-non-selected-windows"); 15486 Qcursor_in_non_selected_windows = intern ("cursor-in-non-selected-windows");
15501 staticpro (&Qcursor_in_non_selected_windows); 15487 staticpro (&Qcursor_in_non_selected_windows);
15502 Qalternate_cursor_type = intern ("alternate-cursor-type");
15503 staticpro (&Qalternate_cursor_type);
15504 Qgrow_only = intern ("grow-only"); 15488 Qgrow_only = intern ("grow-only");
15505 staticpro (&Qgrow_only); 15489 staticpro (&Qgrow_only);
15506 Qinhibit_menubar_update = intern ("inhibit-menubar-update"); 15490 Qinhibit_menubar_update = intern ("inhibit-menubar-update");
@@ -15737,11 +15721,6 @@ go back to their normal size. */);
15737t means to use hollow box cursor. See `cursor-type' for other values. */); 15721t means to use hollow box cursor. See `cursor-type' for other values. */);
15738 Vcursor_in_non_selected_windows = Qt; 15722 Vcursor_in_non_selected_windows = Qt;
15739 15723
15740 DEFVAR_LISP ("alternate-cursor-type", &Valternate_cursor_type,
15741 doc: /* *Cursor type displayed in the blinking cursor off state.
15742t means to use default. See `cursor-type' for other values. */);
15743 Valternate_cursor_type = Qt;
15744
15745 DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist, 15724 DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
15746 doc: /* Alist specifying how to blink the cursor off. 15725 doc: /* Alist specifying how to blink the cursor off.
15747Each element has the form (ON-STATE . OFF-STATE). Whenever the 15726Each element has the form (ON-STATE . OFF-STATE). Whenever the