[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32term.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32term.c |
Date: |
Fri, 01 Mar 2002 17:40:20 -0500 |
Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.146 emacs/src/w32term.c:1.147
*** emacs/src/w32term.c:1.146 Sat Feb 23 11:28:28 2002
--- emacs/src/w32term.c Fri Mar 1 17:40:20 2002
***************
*** 9759,9766 ****
else
new_cursor_type = HOLLOW_BOX_CURSOR;
}
- else if (w->cursor_off_p)
- new_cursor_type = NO_CURSOR;
else
{
struct buffer *b = XBUFFER (w->buffer);
--- 9759,9764 ----
***************
*** 9770,9775 ****
--- 9768,9782 ----
else
new_cursor_type = x_specified_cursor_type (b->cursor_type,
&new_cursor_width);
+ if (w->cursor_off_p)
+ {
+ if (new_cursor_type == FILLED_BOX_CURSOR)
+ new_cursor_type = HOLLOW_BOX_CURSOR;
+ else if (new_cursor_type == BAR_CURSOR && new_cursor_width > 1)
+ new_cursor_width = 1;
+ else
+ new_cursor_type = NO_CURSOR;
+ }
}
}
***************
*** 9780,9786 ****
&& (!on
|| w->phys_cursor.x != x
|| w->phys_cursor.y != y
! || new_cursor_type != w->phys_cursor_type))
x_erase_phys_cursor (w);
/* If the cursor is now invisible and we want it to be visible,
--- 9787,9795 ----
&& (!on
|| w->phys_cursor.x != x
|| w->phys_cursor.y != y
! || new_cursor_type != w->phys_cursor_type)
! || (new_cursor_type == BAR_CURSOR
! && new_cursor_width != w->phys_cursor_width)))
x_erase_phys_cursor (w);
/* If the cursor is now invisible and we want it to be visible,
***************
*** 9805,9813 ****
x_erase_phys_cursor (w);
new_cursor_type = w->phys_cursor_type = NO_CURSOR;
}
else
! w->phys_cursor_type = new_cursor_type;
w->phys_cursor_on_p = 1;
--- 9814,9826 ----
x_erase_phys_cursor (w);
new_cursor_type = w->phys_cursor_type = NO_CURSOR;
+ w->phys_cursor_width = -1;
}
else
! {
! w->phys_cursor_type = new_cursor_type;
! w->phys_cursor_width = new_cursor_width;
! }
w->phys_cursor_on_p = 1;
- [Emacs-diffs] Changes to emacs/src/w32term.c,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/src/w32term.c, Juanma Barranquero, 2002/03/04
- [Emacs-diffs] Changes to emacs/src/w32term.c, Stefan Monnier, 2002/03/04
- [Emacs-diffs] Changes to emacs/src/w32term.c, Jason Rumney, 2002/03/06
- [Emacs-diffs] Changes to emacs/src/w32term.c, Jason Rumney, 2002/03/20
- [Emacs-diffs] Changes to emacs/src/w32term.c, Jason Rumney, 2002/03/22
- [Emacs-diffs] Changes to emacs/src/w32term.c, Jason Rumney, 2002/03/22
- [Emacs-diffs] Changes to emacs/src/w32term.c, Jason Rumney, 2002/03/29
- [Emacs-diffs] Changes to emacs/src/w32term.c, Pavel JanÃk, 2002/03/31