>From 37abf2a8e9a30377a2e064f111d546ec083c3363 Mon Sep 17 00:00:00 2001 From: Charles A. Roelli Date: Mon, 10 Jul 2017 21:08:14 +0200 Subject: [PATCH v2] Enable GUI Emacs without 'make install' on macOS (Bug #27645) * nextstep/INSTALL: Correct it, and mention that Emacs can be run from 'src/emacs'. * src/nsterm.m (applicationDidFinishLaunching:): When Emacs is launched outside of a macOS application bundle, change its activation policy from the default 'prohibited' to 'regular'. ; * etc/NEWS: Mention the change on macOS. --- etc/NEWS | 3 +++ nextstep/INSTALL | 16 ++++++++++++---- src/nsterm.m | 13 +++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index edb7111..36cb80b 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1544,16 +1544,19 @@ execution and return control to the debugger. If no debugger is attached to the receiving process, the call is typically ignored. This is in contrast to the default action on POSIX Systems, where it causes the receiving process to terminate with a core dump if no debugger has been attached to it. ** 'set-mouse-position' and 'set-mouse-absolute-pixel-position' work on macOS. +** Emacs can now be run as a GUI application from the command line on +macOS. + ---------------------------------------------------------------------- This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/nextstep/INSTALL b/nextstep/INSTALL index 799cd4d..b7e84e0 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -16,25 +16,33 @@ Compilation ----------- In the top-level directory, use: ./configure --with-ns (On macOS, --with-ns is enabled by default.) -This will compile all the files, but emacs will not be able to be run except -in -nw (terminal) mode. +Then run: -In order to run Emacs.app, you must run: + make + +This will compile all the files. + +In order to run Emacs, you must run: + + src/emacs + +In order to install Emacs, you must run: make install This will assemble the app in nextstep/Emacs.app (i.e., the --prefix -argument has no effect in this case). +argument has no effect in this case). You can then move the Emacs.app +bundle to a location of your choice. If you pass the --disable-ns-self-contained option to configure, the lisp files will be installed under whatever 'prefix' is set to (defaults to /usr/local). The bundle will be smaller, but depend on these resources (may require 'sudo' for "make install"). Installation diff --git a/src/nsterm.m b/src/nsterm.m index bf83550..7834bac 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5474,16 +5474,29 @@ - (void)applicationDidFinishLaunching: (NSNotification *)notification #ifdef NS_IMPL_COCOA [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(antialiasThresholdDidChange:) name:NSAntialiasThresholdChangedNotification object:nil]; #endif +#ifdef NS_IMPL_COCOA + if ([NSApp activationPolicy] == NSApplicationActivationPolicyProhibited) { + /* Set the app's activation policy to regular when we run outside + of a bundle. This is already done for us by Info.plist when we + run inside a bundle. */ + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; + [NSApp setApplicationIconImage: + [EmacsImage + allocInitFromFile: + build_string("icons/hicolor/128x128/apps/emacs.png")]]; + } +#endif + ns_send_appdefined (-2); } - (void)antialiasThresholdDidChange:(NSNotification *)notification { #ifdef NS_IMPL_COCOA macfont_update_antialias_threshold (); #endif -- 1.7.4.4