Merge branch 'undo_commenting_out' of https://github.com/Luflosi/kitty

kovidgoyal · kovidgoyal · commit c140e17a6fb2 · 2019-11-24T18:08:14.000+05:30
diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m
@@ -470,14 +470,13 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification
         // finishLaunching below, in order to properly emulate the behavior
         // of NSApplicationMain
 
-        // disabled by Kovid
-        /* if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])
+        if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])
         {
             [[NSBundle mainBundle] loadNibNamed:@"MainMenu"
                                           owner:NSApp
                                 topLevelObjects:&_glfw.ns.nibObjects];
         }
-        else */
+        else
             createMenuBar();
     }
     if (finish_launching_callback)

Original file line number	Diff line number	Diff line change
`@@ -470,14 +470,13 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification`
`470`	`470`	`// finishLaunching below, in order to properly emulate the behavior`
`471`	`471`	`// of NSApplicationMain`
`472`	`472`
`473`		`- // disabled by Kovid`
`474`		`- /* if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])`
	`473`	`+ if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])`
`475`	`474`	`{`
`476`	`475`	`[[NSBundle mainBundle] loadNibNamed:@"MainMenu"`
`477`	`476`	`owner:NSApp`
`478`	`477`	`topLevelObjects:&_glfw.ns.nibObjects];`
`479`	`478`	`}`
`480`		`- else */`
	`479`	`+ else`
`481`	`480`	`createMenuBar();`
`482`	`481`	`}`
`483`	`482`	`if (finish_launching_callback)`