From 58c0de6841beb4501be6ea26c22d37e280bb71a4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Sep 2022 18:27:04 +0200 Subject: [PATCH] fix: menu-bar not disabled in some instances It seems unsetting menu-bar-mode is enough on *some* builds of Emacs, but not all. Best we cover all the bases. Amend: 4a253757cbad Fix: #6790 --- lisp/doom-start.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/doom-start.el b/lisp/doom-start.el index 8edd3e7d0..81ab5d141 100644 --- a/lisp/doom-start.el +++ b/lisp/doom-start.el @@ -102,11 +102,14 @@ ;; HACK: I intentionally avoid calling `menu-bar-mode', `tool-bar-mode', and ;; `scroll-bar-mode' because they do extra work to manipulate frame variables ;; that isn't necessary this early in the startup process. -(setq scroll-bar-mode nil - tool-bar-mode nil - menu-bar-mode nil) -;; Setting `scroll-bar-mode' isn't enough to disable them, so: +(push '(menu-bar-lines . 0) default-frame-alist) +(push '(tool-bar-lines . 0) default-frame-alist) (push '(vertical-scroll-bars) default-frame-alist) +;; And set these to nil so users don't have to toggle the modes twice to +;; reactivate them. +(setq menu-bar-mode nil + tool-bar-mode nil + scroll-bar-mode nil) ;; FIX: On MacOS, disabling the menu bar makes MacOS treat Emacs as a ;; non-application window -- which means it doesn't automatically capture ;; focus when it is started, among other things, so enable the menu-bar for