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

[Kim F. Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.788 emacs/src/xdisp.c:1.789
*** emacs/src/xdisp.c:1.788     Fri Oct 18 05:52:44 2002
--- emacs/src/xdisp.c   Thu Oct 24 15:57:22 2002
***************
*** 15288,15304 ****
  }
  
  
! /* Return the cursor we want to be displayed.  In a mini-buffer
!    window, we want the cursor only to appear if we are reading input
!    from this window.  For the selected window, we want the cursor type
!    given by the frame parameter or buffer local setting of
!    cursor-type.  If explicitly marked off, draw no cursor.  In all
!    other cases, we want a hollow box cursor.  */
  
  enum text_cursor_kinds
! get_window_cursor_type (w, width)
       struct window *w;
       int *width;
  {
    struct frame *f = XFRAME (w->frame);
    struct buffer *b = XBUFFER (w->buffer);
--- 15288,15309 ----
  }
  
  
! /* Return the cursor we want to be displayed in window W.  Return
!    width of bar/hbar cursor through WIDTH arg.  Return with
!    ACTIVE_CURSOR arg set to 1 if cursor in window W is `active'
!    (i.e. if the `system caret' should track this cursor).
! 
!    In a mini-buffer window, we want the cursor only to appear if we
!    are reading input from this window.  For the selected window, we
!    want the cursor type given by the frame parameter or buffer local
!    setting of cursor-type.  If explicitly marked off, draw no cursor.
!    In all other cases, we want a hollow box cursor.  */
  
  enum text_cursor_kinds
! get_window_cursor_type (w, width, active_cursor)
       struct window *w;
       int *width;
+      int *active_cursor;
  {
    struct frame *f = XFRAME (w->frame);
    struct buffer *b = XBUFFER (w->buffer);
***************
*** 15306,15311 ****
--- 15311,15318 ----
    Lisp_Object alt_cursor;
    int non_selected = 0;
  
+   *active_cursor = 1;
+ 
    /* Echo area */
    if (cursor_in_echo_area
        && FRAME_HAS_MINIBUF_P (f)
***************
*** 15317,15322 ****
--- 15324,15330 ----
          return FRAME_DESIRED_CURSOR (f);
        }
  
+       *active_cursor = 0;
        non_selected = 1;
      }
  
***************
*** 15327,15332 ****
--- 15335,15342 ----
  #endif
           )
      {
+       *active_cursor = 0;
+ 
        if (MINI_WINDOW_P (w) && minibuf_level == 0)
        return NO_CURSOR;