From 2d3d1e12a80623838dc574c3dfcb5a467db17f8e Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov <bozhidar@tradeo.com> Date: Fri, 22 Mar 2013 14:22:12 +0200 Subject: [PATCH] Remove some problematic menu-bar-mode logic --- core/prelude-osx.el | 2 ++ core/prelude-ui.el | 24 +----------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/core/prelude-osx.el b/core/prelude-osx.el index 8de7c27..c502e06 100644 --- a/core/prelude-osx.el +++ b/core/prelude-osx.el @@ -22,4 +22,6 @@ with a Windows external keyboard from time to time." (define-key prelude-mode-map (kbd "C-c w") 'prelude-swap-meta-and-super) +(menu-bar-mode +1) + (provide 'prelude-osx) diff --git a/core/prelude-ui.el b/core/prelude-ui.el index ae7c6a4..15906cb 100644 --- a/core/prelude-ui.el +++ b/core/prelude-ui.el @@ -39,29 +39,7 @@ (when (fboundp 'tool-bar-mode) (tool-bar-mode -1)) -;; the menu bar is mostly useless as well -;; but removing it under OS X doesn't make much sense - -;; For daemon mode, with-selected-frame seems to be required. Normal -;; mode seems to require with-selected-frame to be absent. -(require 'server) ;;for server-running-p -(defun prelude-frame-config (frame) - "Custom behaviours for new frames." - (if (eq system-type 'darwin) - (if (server-running-p) - (with-selected-frame frame - (if (display-graphic-p) - (modify-frame-parameters frame '((menu-bar-lines . 1))) - (modify-frame-parameters frame '((menu-bar-lines . 0))))) - (if (display-graphic-p) - (modify-frame-parameters frame '((menu-bar-lines . 1))) - (modify-frame-parameters frame '((menu-bar-lines . 0))))) - (menu-bar-mode -1))) - -;; run now -(prelude-frame-config (selected-frame)) -;; and later -(add-hook 'after-make-frame-functions 'prelude-frame-config) +(menu-bar-mode -1) ;; the blinking cursor is nothing, but an annoyance (blink-cursor-mode -1)