[Emacs-diffs] Changes to emacs/src/xterm.c

[Kim F. Storm]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.708 emacs/src/xterm.c:1.709
*** emacs/src/xterm.c:1.708     Thu Feb 28 11:16:52 2002
--- emacs/src/xterm.c   Fri Mar  1 17:38:47 2002
***************
*** 11640,11647 ****
          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);
--- 11640,11645 ----
***************
*** 11651,11656 ****
--- 11649,11663 ----
          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;
+           }
        }
      }
  
***************
*** 11661,11667 ****
        && (!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,
--- 11668,11676 ----
        && (!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,
***************
*** 11678,11683 ****
--- 11687,11693 ----
        w->phys_cursor.hpos = hpos;
        w->phys_cursor.vpos = vpos;
        w->phys_cursor_type = new_cursor_type;
+       w->phys_cursor_width = new_cursor_width;
        w->phys_cursor_on_p = 1;
  
        switch (new_cursor_type)