2 files changed, 6 insertions, 5 deletions

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];