<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e0a3df02c73c1863a7e23955d661b3be1d8ceba1">https://github.com/macports/macports-ports/commit/e0a3df02c73c1863a7e23955d661b3be1d8ceba1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e0a3df02c73 emacs-mac-app-devel: update to 20220119
</span>e0a3df02c73 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e0a3df02c73c1863a7e23955d661b3be1d8ceba1
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sat Jan 29 18:53:47 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app-devel: update to 20220119
</span>---
aqua/emacs-mac-app/Portfile | 138 +++++++----
aqua/emacs-mac-app/files/patch-selfcontained.diff | 276 ++++++++++++++++++++++
2 files changed, 367 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/Portfile b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a533867a4d..b11cb408ee0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,8 @@ maintainers {amake @amake} openmaintainer
</span>
description Emacs Mac port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${name} is "Mac port" addition to GNU Emacs ${emacs_version}. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This provides a native GUI support for Mac OS X 10.6 - macOS 10.14.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This provides a native GUI with tight OS integration.
</span>
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,12 +33,50 @@ depends_lib port:ncurses \
</span> port:gmp \
port:jansson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_emacs.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apple-silicon-arch.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src_emacs.c.diff
</span>
if {${subport} eq ${name}} {
conflicts emacs-mac-app-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-apple-silicon-arch.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move files into the app bundle.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/railwaycat/emacs-mac-port/blob/master/build-emacs.app.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_dir ${destroot}${applications_dir}/Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob ${destroot}${prefix}/share/emacs/${emacs_version}/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${d} ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/share/info ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/share/man ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/var ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin ${app_dir}/../MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${app_dir}/../MacOS/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob ${destroot}${prefix}/libexec/emacs/${emacs_version}/*/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${f} ${app_dir}/../MacOS/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove everything from ${destroot}${prefix} except ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {0 != [string first ${destroot}${prefix} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${app_dir} is not a subdirectory of ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [glob ${destroot}${prefix}/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {0 != [string first ${d} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${d}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make the application binary a hard link.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${app_dir}/../MacOS/Emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file link -hard ${app_dir}/../MacOS/Emacs ${app_dir}/../MacOS/bin/emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rename the app bundle to avoid a conflict with emacs-app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${applications_dir}/Emacs.app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post_destroot_common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,71 +109,77 @@ if {${os.major} >= 11 && ${os.platform} eq "darwin"} {
</span> }
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_version 27.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set emacs_version 28.0.91
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set date 2022-01-19
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211113
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version [string map {- {}} ${date}]
</span> revision 0
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name} is "Mac port" addition to GNU Emacs ${emacs_version}. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This provides a native GUI support for Mac OS X 10.6 - macOS 10.14.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This provides a native GUI with tight OS integration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
fetch.type git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.url --depth=1000 --branch work https://bitbucket.org/mituharu/emacs-mac.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 6c281ea549a9085a7ac68300a58c977945b0c12b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url --shallow-since=${date}T00:00:00 --branch work https://bitbucket.org/mituharu/emacs-mac.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 379a15c67ad253bf0bd014ba25c135c293719562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --shallow-since needs a newer version of git than on some older systems,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so use MacPorts version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_fetch-append port:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.cmd ${prefix}/bin/git
</span>
conflicts emacs-mac-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Bitbucket doesn't seem to have a good way to get the latest commit on a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-selfcontained.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant metal description {Enable experimental Metal support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mac-metal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rename the app bundle to avoid a conflict with the emacs-app port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-selfcontained.diff handles everything but this directory rename.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/mac/Emacs.app ${worksrcpath}/mac/EmacsMac.app
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move files into the app bundle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/railwaycat/emacs-mac-port/blob/master/build-emacs.app.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app_dir ${destroot}${applications_dir}/Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob ${destroot}${prefix}/share/emacs/${emacs_version}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${d} ${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-mac-self-contained
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post_destroot_common
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/info ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/man ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/var ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin ${app_dir}/../MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${app_dir}/../MacOS/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${destroot}${prefix}/libexec/emacs/${emacs_version}/*/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${f} ${app_dir}/../MacOS/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant nativecomp description {Builds emacs with native compilation support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gcc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-native-compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${prefix}/include/gcc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/gcc11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append NATIVE_FULL_AOT=1
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove everything from ${destroot}${prefix} except ${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {0 != [string first ${destroot}${prefix} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${app_dir} is not a subdirectory of ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d [glob ${destroot}${prefix}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {0 != [string first ${d} ${app_dir}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${d}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant metal description {Enable experimental Metal support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mac-metal
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # make the application binary a hard link.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${app_dir}/../MacOS/Emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file link -hard ${app_dir}/../MacOS/Emacs ${app_dir}/../MacOS/bin/emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +nativecomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Bitbucket doesn't seem to have a good way to get the latest commit on a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc post_destroot_common {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global destroot applications_dir site_lisp filespath prefix worksrcpath
</span>
# install site-start.el.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set site_lisp ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set site_lisp ${destroot}${applications_dir}/EmacsMac.app/Contents/Resources/site-lisp
</span> xinstall -d ${site_lisp}
file copy ${filespath}/site-start.el ${site_lisp}
reinplace "s|__PREFIX__|${prefix}|g" ${site_lisp}/site-start.el
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # rename the app bundle to avoid a conflict with emacs-app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${applications_dir}/Emacs.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # install emacs-module.h header file
xinstall -m 0755 -d ${destroot}${prefix}/include/emacs-mac
xinstall -m 0644 ${worksrcpath}/src/emacs-module.h \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-selfcontained.diff b/aqua/emacs-mac-app/files/patch-selfcontained.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cbff034d3c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/patch-selfcontained.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,276 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3f78b0d968..f6447239ce 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,23 +104,23 @@ USE_STARTUP_NOTIFICATION =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ==================== Where To Install Things ====================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Location to install Emacs.app on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Location to install EmacsMac.app on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_appdir=@mac_appdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_appbindir=@mac_appbindir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_applibexecdir=@mac_applibexecdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_appresdir=@mac_appresdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_applibdir=@mac_applibdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Either yes or no depending on whether this is a relocatable Emacs.app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Either yes or no depending on whether this is a relocatable EmacsMac.app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_self_contained=@mac_self_contained@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Location to install Emacs.app under GNUstep / macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Location to install EmacsMac.app under GNUstep / macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Later values may use these.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appdir=@ns_appdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appbindir=@ns_appbindir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibexecdir=@ns_applibexecdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appresdir=@ns_appresdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibdir=@ns_applibdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Either yes or no depending on whether this is a relocatable Emacs.app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Either yes or no depending on whether this is a relocatable EmacsMac.app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_self_contained=@ns_self_contained@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The default location for installation. Everything is placed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,8 +355,8 @@ BIN_DESTDIR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELN_DESTDIR = ${ns_applibdir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BIN_DESTDIR='${mac_appbindir}/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELN_DESTDIR = ${mac_applibdir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BIN_DESTDIR='$(DESTDIR)${mac_appbindir}/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELN_DESTDIR = $(DESTDIR)${mac_applibdir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: ${SUBDIR} info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -438,7 +438,7 @@ epaths-force-w32:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bundle root itself with the relative path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epaths-force-mac-self-contained: epaths-force
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @(sed < src/epaths.h > epaths.h.$$$$ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -e 's;${mac_appdir}/Emacs.app/;;') && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -e 's;${mac_appdir}/EmacsMac.app/;;') && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epaths-force-ns-self-contained: epaths-force
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -541,9 +541,9 @@ install-arch-dep:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) -C lib-src install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$(realpath $(DESTDIR)${mac_appdir})" != "`cd mac && /bin/pwd`"; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- umask 022; ${MKDIR_P} $(DESTDIR)${mac_appdir}/Emacs.app; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd mac/Emacs.app; (tar -chf - . | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd $(DESTDIR)${mac_appdir}/Emacs.app; umask 022; tar -xvf - \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ umask 022; ${MKDIR_P} $(DESTDIR)${mac_appdir}/EmacsMac.app; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd mac/EmacsMac.app; (tar -chf - . | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd $(DESTDIR)${mac_appdir}/EmacsMac.app; umask 022; tar -xvf - \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && cat > /dev/null))) || exit 1; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (${mac_self_contained},no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -562,8 +562,8 @@ install-arch-dep:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf ${ns_appresdir}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- subdir=${mac_appresdir}/site-lisp && ${write_subdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf ${mac_appresdir}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subdir=$(DESTDIR)${mac_appresdir}/site-lisp && ${write_subdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -rf $(DESTDIR)${mac_appresdir}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Windows-specific install target for installing programs produced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6c09f86725..9792c534c4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,7 +536,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE(mac-app,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([--enable-mac-app@<:@=DIR@:>@],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [specify install directory for Emacs.app on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [specify install directory for EmacsMac.app on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [DIR=/Application]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ mac_appdir_x=${enableval}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1910,10 +1910,10 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac_appbindir=${mac_appdir}/Emacs.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac_applibexecdir=${mac_appdir}/Emacs.app/Contents/MacOS/libexec/${configuration}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac_applibdir=${mac_appdir}/Emacs.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac_appresdir=${mac_appdir}/Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_appbindir=${mac_appdir}/EmacsMac.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_applibexecdir=${mac_appdir}/EmacsMac.app/Contents/MacOS/libexec/${configuration}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_applibdir=${mac_appdir}/EmacsMac.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_appresdir=${mac_appdir}/EmacsMac.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${with_native_image_api}" = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(HAVE_NATIVE_IMAGE_API, 1, [Define to use native OS APIs for images.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1937,7 +1937,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Even a headless Emacs can build macuvs.h, so this should let you bootstrap.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NS_IMPL_COCOA=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ns_appdir=`pwd`/nextstep/Emacs.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ns_appdir=`pwd`/nextstep/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appbindir=${ns_appdir}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibexecdir=${ns_appdir}/Contents/MacOS/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibdir=${ns_appdir}/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1996,7 +1996,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $NS_IMPL_GNUSTEP = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ns_appdir=`pwd`/nextstep/Emacs.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ns_appdir=`pwd`/nextstep/EmacsMac.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appbindir=${ns_appdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibexecdir=${ns_appdir}/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_applibdir=${ns_appdir}/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4204,7 +4204,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We also have mouse menus.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_MENUS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tell src/Makefile.in to create files in the macOS application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # bundle mac/Emacs.app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # bundle mac/EmacsMac.app.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OTHER_FILES=macosx-app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6162,7 +6162,7 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_ECHO(["Run '${MAKE-make}' to build Emacs, then run 'src/emacs' to test it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Run '${MAKE-make} install' in order to build an application bundle.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The application will go to nextstep/Emacs.app and can be run or moved
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The application will go to nextstep/EmacsMac.app and can be run or moved
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from there."])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$EN_NS_SELF_CONTAINED" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "The application will be fully self-contained."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6194,8 +6194,8 @@ AC_DEFUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAC_TEMPLATE_FILES=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$HAVE_MACGUI" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CONFIG_FILES([mac/Emacs.app/Contents/Info.plist:mac/templates/Info.plist.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:mac/templates/InfoPlist.strings.in])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_CONFIG_FILES([mac/EmacsMac.app/Contents/Info.plist:mac/templates/Info.plist.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac/EmacsMac.app/Contents/Resources/English.lproj/InfoPlist.strings:mac/templates/InfoPlist.strings.in])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAC_TEMPLATE_FILES="mac/templates/Info.plist.in mac/templates/InfoPlist.strings.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(MAC_TEMPLATE_FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib-src/Makefile.in lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 338ba0d576..9aa30193cc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib-src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,8 @@ top_builddir =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ==================== Where To Install Things ====================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mac_applibexecdir=@mac_applibexecdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Location to install Emacs.app under GNUstep / macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Later values may use this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_appbindir=@ns_appbindir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mac/Emacs.app/Contents/MacOS/Emacs.sh mac/EmacsMac.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+similarity index 100%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename from mac/Emacs.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename to mac/EmacsMac.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mac/Emacs.app/Contents/PkgInfo mac/EmacsMac.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+similarity index 100%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename from mac/Emacs.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename to mac/EmacsMac.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mac/Emacs.app/Contents/Resources/Emacs.icns mac/EmacsMac.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+similarity index 100%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename from mac/Emacs.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename to mac/EmacsMac.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mac/Emacs.app/Contents/Resources/document.icns mac/EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+similarity index 100%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename from mac/Emacs.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename to mac/EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mac/Makefile.in mac/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e1663c1a8f..7e1cdea452 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mac/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mac/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,9 +33,9 @@ mac_self_contained=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(DUMPING),pdumper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (${mac_self_contained},no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bundle_pdmp := Emacs.app/Contents/MacOS/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bundle_pdmp := EmacsMac.app/Contents/MacOS/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bundle_pdmp := Emacs.app/Contents/MacOS/libexec/${configuration}/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bundle_pdmp := EmacsMac.app/Contents/MacOS/libexec/${configuration}/Emacs.pdmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bundle_pdmp :=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,31 +44,31 @@ bundle_pdmp :=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lprojs = English Dutch French German Italian Japanese Spanish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ar ca cs da el en_AU en_GB es_419 es_MX fi fr_CA he hi hr hu id ko ms no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pl pt pt_BR pt_PT ro ru sk sv th tr uk vi zh_CN zh_HK zh_TW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-lprojdirs = $(patsubst %,Emacs.app/Contents/Resources/%.lproj,${lprojs})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++lprojdirs = $(patsubst %,EmacsMac.app/Contents/Resources/%.lproj,${lprojs})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${lprojdirs}:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${MKDIR_P} $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(CURDIR), $(realpath ${srcdir}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Emacs.app/Contents/MacOS/Emacs.sh: ${srcdir}/Emacs.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${MKDIR_P} Emacs.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EmacsMac.app/Contents/MacOS/Emacs.sh: ${srcdir}/EmacsMac.app/Contents/MacOS/Emacs.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MKDIR_P} EmacsMac.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Emacs.app/Contents/PkgInfo: ${srcdir}/Emacs.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EmacsMac.app/Contents/PkgInfo: ${srcdir}/EmacsMac.app/Contents/PkgInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Emacs.app/Contents/Resources/Emacs.icns: ${srcdir}/Emacs.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${MKDIR_P} Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EmacsMac.app/Contents/Resources/Emacs.icns: ${srcdir}/EmacsMac.app/Contents/Resources/Emacs.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MKDIR_P} EmacsMac.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Emacs.app/Contents/Resources/document.icns: ${srcdir}/Emacs.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${MKDIR_P} Emacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EmacsMac.app/Contents/Resources/document.icns: ${srcdir}/EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MKDIR_P} EmacsMac.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-macosx-bundle: ${lprojdirs} Emacs.app/Contents/MacOS/Emacs.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Emacs.app/Contents/PkgInfo Emacs.app/Contents/Resources/Emacs.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Emacs.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-macosx-app: macosx-bundle Emacs.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Emacs.app/Contents/MacOS/Emacs: ../src/emacs${EXEEXT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${MKDIR_P} Emacs.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++macosx-bundle: ${lprojdirs} EmacsMac.app/Contents/MacOS/Emacs.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EmacsMac.app/Contents/PkgInfo EmacsMac.app/Contents/Resources/Emacs.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EmacsMac.app/Contents/Resources/document.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++macosx-app: macosx-bundle EmacsMac.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EmacsMac.app/Contents/MacOS/Emacs: ../src/emacs${EXEEXT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MKDIR_P} EmacsMac.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(DUMPING),pdumper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,12 +86,12 @@ .PHONY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf ${lprojdirs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f Emacs.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f EmacsMac.app/Contents/MacOS/Emacs $(bundle_pdmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distclean: clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f Emacs.app/Contents/Info.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f EmacsMac.app/Contents/Info.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EmacsMac.app/Contents/Resources/English.lproj/InfoPlist.strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bootstrap-clean maintainer-clean: distclean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/emacs.c src/emacs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c0df96f828..d598e8d48c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/emacs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/emacs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,10 +531,10 @@ init_cmdargs (int argc, char **argv, int skip_args, char const *original_pwd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined HAVE_MACGUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If we are running from the build directory, set DIR to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src subdirectory of the Emacs tree. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (SBYTES (dir) > sizeof ("/mac/Emacs.app/Contents/MacOS/") - 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (SBYTES (dir) > sizeof ("/mac/EmacsMac.app/Contents/MacOS/") - 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && 0 == strcmp ((SSDATA (dir) + SBYTES (dir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- - sizeof ("/mac/Emacs.app/Contents/MacOS/") + 1),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/mac/Emacs.app/Contents/MacOS/"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - sizeof ("/mac/EmacsMac.app/Contents/MacOS/") + 1),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "/mac/EmacsMac.app/Contents/MacOS/"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NILP (Vpurify_flag))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>