diff options
| author | Juri Linkov <juri@linkov.net> | 2019-10-01 23:15:03 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-10-01 23:15:03 +0300 |
| commit | 2698d3dba2e9858b026ed127d4de3f86810a5ef3 (patch) | |
| tree | 8e9b8f194cfcad8af83a4174a0105bbc691f06d6 /lisp/startup.el | |
| parent | 25f45d710e91a7c1049f056ff27bc3e6968f5624 (diff) | |
| parent | 3f981a0a89bca47a207fb362485f07e7322bb145 (diff) | |
| download | emacs-2698d3dba2e9858b026ed127d4de3f86810a5ef3.tar.gz | |
Merge branch 'feature/tabs'
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 52d4dbb05c8..393d7872560 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -769,6 +769,7 @@ It is the default value of the variable `top-level'." ("--background-color" . "-bg") ("--color" . "-color"))) +;; FIXME: this var unused? (defconst tool-bar-images-pixel-height 24 "Height in pixels of images in the tool-bar.") @@ -1300,6 +1301,7 @@ please check its value") (unless (daemonp) (if (or noninteractive emacs-basic-display) (setq menu-bar-mode nil + tab-bar-mode nil tool-bar-mode nil no-blinking-cursor t)) (frame-initialize)) @@ -1515,6 +1517,7 @@ This can set the values of `menu-bar-mode', `tool-bar-mode', and settings will be marked as \"CHANGED outside of Customize\"." (let ((no-vals '("no" "off" "false" "0")) (settings '(("menuBar" "MenuBar" menu-bar-mode nil) + ("tabBar" "TabBar" tab-bar-mode nil) ("toolBar" "ToolBar" tool-bar-mode nil) ("scrollBar" "ScrollBar" scroll-bar-mode nil) ("cursorBlink" "CursorBlink" no-blinking-cursor t)))) |