[Emacs-diffs] Changes to emacs/src/nsterm.m,v

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      08/08/21 15:49:48

Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- nsterm.m    21 Aug 2008 02:49:00 -0000      1.25
+++ nsterm.m    21 Aug 2008 15:49:47 -0000      1.26
@@ -2294,6 +2294,7 @@
 
   if (cursor_type == NO_CURSOR)
     {
+      w->phys_cursor_on_p = 0;
       w->phys_cursor_width = 0;
       return;
     }
@@ -2325,7 +2326,6 @@
 
   oldCursorType = FRAME_CURSOR (f);
   cursorType = FRAME_CURSOR (f) = FRAME_NEW_CURSOR (f);
-
   /* TODO: 23: use emacs stored cursor color instead of ns-specific */
   f->output_data.ns->current_cursor_color
     = f->output_data.ns->desired_cursor_color;
@@ -2335,14 +2335,16 @@
   ns_clip_to_row (w, glyph_row, -1, NO);
 /*  ns_focus (f, &r, 1); */
 
+  /* Why would this be needed?
   if (FRAME_LAST_INACTIVE (f))
     {
-      /* previously hollow box; clear entire area */
+      * previously hollow box; clear entire area *
       [FRAME_BACKGROUND_COLOR (f) set];
       NSRectFill (r);
       drawGlyph = 1;
       FRAME_LAST_INACTIVE (f) = NO;
     }
+  */
 
   /* prepare to draw */
   if (cursorType == no_highlight || cursor_type == NO_CURSOR)
@@ -2424,8 +2426,7 @@
       if (!active_p)
        {
          /* inactive window: ignore what we just set and use a hollow box */
-         cursorType = hollow_box;
-         [FRAME_CURSOR_COLOR (f) set];
+         cursorType = HOLLOW_BOX_CURSOR;
        }
 
       NSDisableScreenUpdates ();