[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE]
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE] |
Date: |
Tue, 02 Oct 2007 02:13:06 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Richard M. Stallman <rms> 07/10/02 02:13:06
Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1149.2.8
retrieving revision 1.1149.2.9
diff -u -b -r1.1149.2.8 -r1.1149.2.9
--- xdisp.c 7 Aug 2007 15:54:27 -0000 1.1149.2.8
+++ xdisp.c 2 Oct 2007 02:13:05 -0000 1.1149.2.9
@@ -21299,7 +21299,7 @@
non_selected = 1;
}
- /* Nonselected window or nonselected frame. */
+ /* Detect a nonselected window or nonselected frame. */
else if (w != XWINDOW (f->selected_window)
#ifdef HAVE_WINDOW_SYSTEM
|| f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame
@@ -21318,13 +21318,6 @@
if (NILP (b->cursor_type))
return NO_CURSOR;
- /* Use cursor-in-non-selected-windows for non-selected window or frame. */
- if (non_selected)
- {
- alt_cursor = b->cursor_in_non_selected_windows;
- return get_specified_cursor_type (alt_cursor, width);
- }
-
/* Get the normal cursor type for this window. */
if (EQ (b->cursor_type, Qt))
{
@@ -21334,6 +21327,21 @@
else
cursor_type = get_specified_cursor_type (b->cursor_type, width);
+ /* Use cursor-in-non-selected-windows instead
+ for non-selected window or frame. */
+ if (non_selected)
+ {
+ alt_cursor = b->cursor_in_non_selected_windows;
+ if (!EQ (Qt, alt_cursor))
+ return get_specified_cursor_type (alt_cursor, width);
+ /* t means modify the normal cursor type. */
+ if (cursor_type == FILLED_BOX_CURSOR)
+ cursor_type = HOLLOW_BOX_CURSOR;
+ else if (cursor_type == BAR_CURSOR && *width > 1)
+ --*width;
+ return cursor_type;
+ }
+
/* Use normal cursor if not blinked off. */
if (!w->cursor_off_p)
{
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE],
Richard M. Stallman <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE], Martin Rudalics, 2007/10/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE], Richard M. Stallman, 2007/10/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE], YAMAMOTO Mitsuharu, 2007/10/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE], Jason Rumney, 2007/10/30