(Qbar, Qbox): Removed.

(syms_of_macfns): Don't intern or staticpro them.

diff --git a/src/ChangeLog b/src/ChangeLog
index baea03c5363d81dd4cd9f08451a803853f7e1e69..4b15b68aa4fc9f082fa52e6df3db48f1bdbcaf8e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -37,7 +37,9 @@
 
        * macfns.c (x_specified_cursor_type): Removed.
        (x_set_cursor_type): Use set_frame_cursor_types.
-
+       (Qbar, Qbox): Removed.
+       (syms_of_macfns): Don't intern or staticpro them.
+       
        * macterm.c (x_specified_cursor_type): Remove prototype.
        (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH.
        (x_display_and_set_cursor): Use get_window_cursor_type.

diff --git a/src/macfns.c b/src/macfns.c
index 8ec44b18f152bc97c0ad31459049f54d210bede4..88a7774a4f75c57a138e2e91b8fc9d3493349106 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -199,10 +199,8 @@ Lisp_Object Vx_pixel_size_width_font_regexp;
 /*&&& symbols declared here &&&*/
 Lisp_Object Qauto_raise;
 Lisp_Object Qauto_lower;
-Lisp_Object Qbar;
 Lisp_Object Qborder_color;
 Lisp_Object Qborder_width;
-Lisp_Object Qbox;
 Lisp_Object Qcursor_color;
 Lisp_Object Qcursor_type;
 Lisp_Object Qgeometry;
@@ -9889,14 +9887,10 @@ syms_of_macfns ()
   staticpro (&Qauto_raise);
   Qauto_lower = intern ("auto-lower");
   staticpro (&Qauto_lower);
-  Qbar = intern ("bar");
-  staticpro (&Qbar);
   Qborder_color = intern ("border-color");
   staticpro (&Qborder_color);
   Qborder_width = intern ("border-width");
   staticpro (&Qborder_width);
-  Qbox = intern ("box");
-  staticpro (&Qbox);
   Qcursor_color = intern ("cursor-color");
   staticpro (&Qcursor_color);
   Qcursor_type = intern ("cursor-type");