Execute tool-bar-setup only if the tool bar is enabled.

This commit is contained in:
James Cherti
2024-09-16 09:22:02 -04:00
parent 337e668f64
commit 29d02f53e8

View File

@@ -272,7 +272,8 @@ When set to non-nil, Emacs will automatically call `package-initialize' and
(define-advice startup--load-user-init-file (define-advice startup--load-user-init-file
(:after (&rest _) minimal-emacs-setup-toolbar) (:after (&rest _) minimal-emacs-setup-toolbar)
(advice-remove #'tool-bar-setup #'ignore) (advice-remove #'tool-bar-setup #'ignore)
(tool-bar-setup))))) (when tool-bar-mode
(tool-bar-setup))))))
(unless (memq 'tool-bar minimal-emacs-ui-features) (unless (memq 'tool-bar minimal-emacs-ui-features)
(push '(tool-bar-lines . 0) default-frame-alist) (push '(tool-bar-lines . 0) default-frame-alist)
(setq tool-bar-mode nil)) (setq tool-bar-mode nil))