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

[Kim F. Storm]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.10 emacs/src/macfns.c:1.11
*** emacs/src/macfns.c:1.10     Wed Jul 31 23:53:04 2002
--- emacs/src/macfns.c  Fri Aug 30 08:01:27 2002
***************
*** 2389,2438 ****
    update_face_from_frame_parameter (f, Qborder_color, arg);
  }
  
- /* Value is the internal representation of the specified cursor type
-    ARG.  If type is BAR_CURSOR, return in *WIDTH the specified width
-    of the bar cursor.  */
- 
- enum text_cursor_kinds
- x_specified_cursor_type (arg, width)
-      Lisp_Object arg;
-      int *width;
- {
-   enum text_cursor_kinds type;
-   
-   if (EQ (arg, Qbar))
-     {
-       type = BAR_CURSOR;
-       *width = 2;
-     }
-   else if (CONSP (arg)
-          && EQ (XCAR (arg), Qbar)
-          && INTEGERP (XCDR (arg))
-          && XINT (XCDR (arg)) >= 0)
-     {
-       type = BAR_CURSOR;
-       *width = XINT (XCDR (arg));
-     }
-   else if (NILP (arg))
-     type = NO_CURSOR;
-   else
-     /* Treat anything unknown as "box cursor".
-        It was bad to signal an error; people have trouble fixing
-        .Xdefaults with Emacs, when it has something bad in it.  */
-     type = FILLED_BOX_CURSOR;
- 
-   return type;
- }
- 
  void
  x_set_cursor_type (f, arg, oldval)
       FRAME_PTR f;
       Lisp_Object arg, oldval;
  {
!   int width;
!   
!   FRAME_DESIRED_CURSOR (f) = x_specified_cursor_type (arg, &width);
!   f->output_data.mac->cursor_width = width;
  
    /* Make sure the cursor gets redrawn.  This is overkill, but how
       often do people change cursor types?  */
--- 2389,2400 ----
    update_face_from_frame_parameter (f, Qborder_color, arg);
  }
  
  void
  x_set_cursor_type (f, arg, oldval)
       FRAME_PTR f;
       Lisp_Object arg, oldval;
  {
!   set_frame_cursor_types (f, arg);
  
    /* Make sure the cursor gets redrawn.  This is overkill, but how
       often do people change cursor types?  */