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

[Eli Zaretskii]

Index: emacs/src/msdos.c
diff -c emacs/src/msdos.c:1.171 emacs/src/msdos.c:1.172
*** emacs/src/msdos.c:1.171     Fri Apr 12 01:57:21 2002
--- emacs/src/msdos.c   Fri Apr 19 08:13:47 2002
***************
*** 412,418 ****
  /* A flag to control how to display unibyte 8-bit characters.  */
  extern int unibyte_display_via_language_environment;
  
! Lisp_Object Qbar;
  
  /* The screen colors of the curent frame, which serve as the default
     colors for newly-created frames.  */
--- 412,418 ----
  /* A flag to control how to display unibyte 8-bit characters.  */
  extern int unibyte_display_via_language_environment;
  
! Lisp_Object Qbar, Qhbar;
  
  /* The screen colors of the curent frame, which serve as the default
     colors for newly-created frames.  */
***************
*** 820,831 ****
  static void
  IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type)
  {
!   if (EQ (cursor_type, Qbar))
      {
        /* Just BAR means the normal EGA/VGA cursor.  */
        msdos_set_cursor_shape (f, DEFAULT_CURSOR_START, DEFAULT_CURSOR_WIDTH);
      }
!   else if (CONSP (cursor_type) && EQ (XCAR (cursor_type), Qbar))
      {
        Lisp_Object bar_parms = XCDR (cursor_type);
        int width;
--- 820,833 ----
  static void
  IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type)
  {
!   if (EQ (cursor_type, Qbar) || EQ (cursor_type, Qhbar))
      {
        /* Just BAR means the normal EGA/VGA cursor.  */
        msdos_set_cursor_shape (f, DEFAULT_CURSOR_START, DEFAULT_CURSOR_WIDTH);
      }
!   else if (CONSP (cursor_type)
!          && (EQ (XCAR (cursor_type), Qbar)
!              || EQ (XCAR (cursor_type), Qhbar)))
      {
        Lisp_Object bar_parms = XCDR (cursor_type);
        int width;
***************
*** 2477,2483 ****
          IT_set_cursor_type (f, val);
          if (termscript)
            fprintf (termscript, "<CTYPE: %s>\n",
!                    EQ (val, Qbar) || CONSP (val) && EQ (XCAR (val), Qbar)
                     ? "bar" : "box");
        }
        store_frame_param (f, prop, val);
--- 2479,2487 ----
          IT_set_cursor_type (f, val);
          if (termscript)
            fprintf (termscript, "<CTYPE: %s>\n",
!                    EQ (val, Qbar) || EQ (val, Qhbar)
!                    || CONSP (val) && (EQ (XCAR (val), Qbar)
!                                       || EQ (XCAR (val), Qhbar))
                     ? "bar" : "box");
        }
        store_frame_param (f, prop, val);
***************
*** 5351,5356 ****
--- 5355,5362 ----
    /* The following two are from xfns.c:  */
    Qbar = intern ("bar");
    staticpro (&Qbar);
+   Qhbar = intern ("hbar");
+   staticpro (&Qhbar);
    Qcursor_type = intern ("cursor-type");
    staticpro (&Qcursor_type);
    Qreverse = intern ("reverse");