From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 6 Oct 2013 15:59:11 +0000 (+0200)
Subject: Don't force auto hide dock when hide menu changes.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1370
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3e9050cbbfc97d3e0d37a84fcaa00f724e34bfa;p=emacs.git

Don't force auto hide dock when hide menu changes.

(ns_update_auto_hide_menu_bar): Remove runtime check.
Don't auto hide dock unless menubar is also auto hidden.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index af5dbb8924d..07af64ab1a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
 	hide toolbar (Bug#15388).
 	(windowDidEnterFullScreen:): If presentation options are zero,
 	set them here (Bug#15388).
+	(ns_update_auto_hide_menu_bar): Remove runtime check.
+	Don't auto hide dock unless menubar is also auto hidden.
 
 2013-10-05  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/src/nsterm.m b/src/nsterm.m
index be660d99e8a..696d379206e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -633,9 +633,7 @@ ns_update_auto_hide_menu_bar (void)
 
   NSTRACE (ns_update_auto_hide_menu_bar);
 
-  if (NSApp != nil
-      && [NSApp isActive]
-      && [NSApp respondsToSelector:@selector(setPresentationOptions:)])
+  if (NSApp != nil && [NSApp isActive])
     {
       // Note, "setPresentationOptions" triggers an error unless the
       // application is active.
@@ -644,10 +642,11 @@ ns_update_auto_hide_menu_bar (void)
       if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden)
         {
           NSApplicationPresentationOptions options
-            = NSApplicationPresentationAutoHideDock;
+            = NSApplicationPresentationDefault;
 
           if (menu_bar_should_be_hidden)
-            options |= NSApplicationPresentationAutoHideMenuBar;
+            options |= NSApplicationPresentationAutoHideMenuBar
+              | NSApplicationPresentationAutoHideDock;
 
           [NSApp setPresentationOptions: options];