diff src/w32fns.c @ 109358:a9586dc942d5

Merge from mainline.

--- a/src/w32fns.c	Sat Jul 10 10:34:43 2010 +0000
+++ b/src/w32fns.c	Mon Jul 12 13:21:11 2010 +0000
@@ -288,10 +288,15 @@
 #define MENU_FREE_DELAY 1000
 static unsigned menu_free_timer = 0;
 
+/* In dispnew.c */
+
+extern Lisp_Object Vwindow_system_version;
+
 /* The below are defined in frame.c.  */
 
 extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode;
 extern Lisp_Object Vwindow_system_version;
+extern Lisp_Object Qtooltip;
 
 #ifdef GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
@@ -5476,9 +5481,8 @@
   change_frame_size (f, height, width, 1, 0, 0);
 
   /* Add `tooltip' frame parameter's default value. */
-  if (NILP (Fframe_parameter (frame, intern ("tooltip"))))
-    Fmodify_frame_parameters (frame, Fcons (Fcons (intern ("tooltip"), Qt),
-					    Qnil));
+  if (NILP (Fframe_parameter (frame, Qtooltip)))
+    Fmodify_frame_parameters (frame, Fcons (Fcons (Qtooltip, Qt), Qnil));
 
   /* Set up faces after all frame parameters are known.  This call
      also merges in face attributes specified for new frames.