(Qcursor_type, Qbar, Qhbar): Declare extern.

(syms_of_msdos): Don't intern and staticpro them.

diff --git a/src/ChangeLog b/src/ChangeLog
index f29fe7403ef8171ad0dc2816b80a655f5267e1bc..dc5f96e1f3fe0d18ce780c5a13b9e0a936d17b98 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-29  Kim F. Storm  <storm@cua.dk>
+
+       * msdos.c (Qcursor_type, Qbar, Qhbar): Declare extern.
+       (syms_of_msdos): Don't intern and staticpro them.
+
 2003-11-27  Kim F. Storm  <storm@cua.dk>
 
        * dispnew.c (buffer_posn_from_coords): Calculate and return pixel

diff --git a/src/msdos.c b/src/msdos.c
index b04b55c22606b0c41ab2e6a1fea6d1f7d31f13b7..a2fd011e74c15bdcf636b0487b477bd68b578bf2 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -413,7 +413,8 @@ static unsigned short screen_virtual_offset = 0;
 /* A flag to control how to display unibyte 8-bit characters.  */
 extern int unibyte_display_via_language_environment;
 
-Lisp_Object Qbar, Qhbar;
+extern Lisp_Object Qcursor_type;
+extern Lisp_Object Qbar, Qhbar;
 
 /* The screen colors of the current frame, which serve as the default
    colors for newly-created frames.  */
@@ -1993,8 +1994,6 @@ IT_update_end (struct frame *f)
   FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0;
 }
 
-Lisp_Object Qcursor_type;
-
 static void
 IT_frame_up_to_date (struct frame *f)
 {
@@ -5267,18 +5266,11 @@ syms_of_msdos ()
 #ifndef HAVE_X_WINDOWS
 
   /* 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");
   staticpro (&Qreverse);
 
   DEFVAR_LISP ("dos-unsupported-char-glyph", &Vdos_unsupported_char_glyph,
               doc: /* *Glyph to display instead of chars not supported by current codepage.
-
 This variable is used only by MSDOS terminals.  */);
   Vdos_unsupported_char_glyph = '\177';