Text-based nox builds compiled without X window support

lisp/loadup.el

@@ -267,6 +267,7 @@
 (load "rfn-eshadow")
 
 (load "menu-bar")
+(load "tab-bar")
 (load "emacs-lisp/lisp")
 (load "textmodes/page")
 (load "register")
@@ -290,8 +291,7 @@
       (load "image")
       (load "international/fontset")
       (load "dnd")
-      (load "tool-bar")
-      (load "tab-bar")))
+      (load "tool-bar")))
 
 (if (featurep 'dynamic-setting)
     (load "dynamic-setting"))

lisp/xt-mouse.el

@@ -257,7 +257,7 @@ which is the \"1006\" extension implemented in Xterm >= 277."
                                                 (or (not menu-bar-mode)
                                                     ;; The tab-bar is on the
                                                     ;; second row below menu-bar
-                                                    (eq (cdr (nth 6 (posn-at-x-y x y))) 1)))
+                                                    (eq y 1)))
                                            'tab-bar
                                          'menu-bar))
                              (nthcdr 2 (posn-at-x-y x y)))))

src/window.h

@@ -753,6 +753,8 @@ wset_next_buffers (struct window *w, Lisp_Object val)
 #define WINDOW_TAB_BAR_P(W) \
   (WINDOWP (WINDOW_XFRAME (W)->tab_bar_window) \
    && (W) == XWINDOW (WINDOW_XFRAME (W)->tab_bar_window))
+#else
+#define WINDOW_TAB_BAR_P(W) false
 #endif
 
 /* True if W is a tool bar window.  */