Cleanup string bytes checking.

[gnu-emacs] / src / xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index aac34d35ef410eaf7a7533f7de00603070b75097..a11b117f067de555e98810c40656039fdbfd88c1 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2736,7 +2736,11 @@ init_iterator (struct it *it, struct window *w,
      frames when the fringes are turned off.  But leave the dimensions
      zero for tooltip frames, as these glyphs look ugly there and also
      sabotage calculations of tooltip dimensions in x-show-tip.  */
-  if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame)))
+#ifdef HAVE_WINDOW_SYSTEM
+  if (!(FRAME_WINDOW_P (it->f)
+       && FRAMEP (tip_frame)
+       && it->f == XFRAME (tip_frame)))
+#endif
     {
       if (it->line_wrap == TRUNCATE)
        {
@@ -28932,10 +28936,10 @@ and is used only on frames for which no explicit name has been set
 \(see `modify-frame-parameters').  */);
   Vicon_title_format
     = Vframe_title_format
-    = listn (PURE, 3,
+    = listn (CONSTYPE_PURE, 3,
             intern_c_string ("multiple-frames"),
             build_pure_c_string ("%b"),
-            listn (PURE, 4,
+            listn (CONSTYPE_PURE, 4,
                    empty_unibyte_string,
                    intern_c_string ("invocation-name"),
                    build_pure_c_string ("@"),