<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7869a0e0636b6ab2069d1466f86c2834b739805">https://github.com/macports/macports-ports/commit/e7869a0e0636b6ab2069d1466f86c2834b739805</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 e7869a0 Merge emacs-app(-devel) into a subport of emacs
</span>e7869a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7869a0e0636b6ab2069d1466f86c2834b739805
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Sun Nov 13 01:16:13 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> Merge emacs-app(-devel) into a subport of emacs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This also brings emacs-app up to 25.1 and emacs-app-devel to a recent
</span><span style='display:block; white-space:pre;color:#404040;'> snapshot.
</span>---
aqua/emacs-app-devel/Portfile | 51 ----
aqua/emacs-app-devel/files/site-start.el | 1 -
aqua/emacs-app/Portfile | 83 -------
editors/emacs/Portfile | 109 ++++++--
{aqua/emacs-app => editors/emacs}/files/nawk.patch | 0
.../emacs/files/patch-devel-src_emacs.c.diff | 15 +-
.../emacs/files/patch-inline-25.1-20151017.diff | 274 +++++++++++++--------
.../emacs}/files/patch-src-macim.m.diff | 0
.../emacs}/files/patch-src_emacs.c.diff | 0
.../emacs}/files/site-start.el | 0
10 files changed, 268 insertions(+), 265 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app-devel/Portfile b/aqua/emacs-app-devel/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 823539b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-app-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name emacs-app-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20151029
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories aqua editors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The GNU Emacs text editor, recent Git development version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GNU Emacs is a self-documenting, customizable, extensible real-time \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- display editor. Users new to Emacs will be able to use basic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- features fairly rapidly by studying the tutorial and using the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self-documentation features. Emacs also has an extensive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- interactive manual browser. It is easily extensible since its \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- editing commands are written in Lisp. This port uses the Git version\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of the code from a recent date, which includes the NextStep (aqua) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.gnu.org/software/emacs/emacs.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url git://git.savannah.gnu.org/emacs.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url http://git.savannah.gnu.org/r/emacs.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch db31a883252e17af4386598c52d42ed81db56973
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.cmd "./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-ns --without-x --without-dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:autoconf port:automake port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && make install"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/nextstep/Emacs.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${filespath}/site-start.el \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
</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:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
</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:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app-devel/files/site-start.el b/aqua/emacs-app-devel/files/site-start.el
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5f22274..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-app-devel/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(setq load-path (cons "__PREFIX__/share/emacs/site-lisp" load-path))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/Portfile b/aqua/emacs-app/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90f1b13..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,83 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name emacs-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 24.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories aqua editors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers hum openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The GNU Emacs text editor (Cocoa version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description GNU Emacs is a self-documenting, customizable, extensible \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- real-time display editor. This is a port of the latest GNU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Emacs source to the OpenStep (or NeXTstep) APIs, as \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implemented by Cocoa on OS X. It differs from Carbon ports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of GNU Emacs in that it makes a more concerted attempt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from the ground up to follow OS X desktop and UI conventions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.gnu.org/software/emacs/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnu:emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname emacs-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir emacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 50a778a959db89b127970c1173dbe351671eb48b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2737a6622fb2d9982e9c47fb6f2fb297bda42674e09db40fc9bcc0db4297c3b6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts emacs-app-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnutls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles nawk.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/src/emacs.c
</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:#ffe0e0;'>-configure.args --with-ns --without-x --without-dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "make install"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/nextstep/Emacs.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix read-permission to resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod a+r ${destroot}${applications_dir}/Emacs.app/Contents/Resources/*"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${filespath}/site-start.el \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
</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:#ffe0e0;'>-variant inline description {Apply inline patch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-inline-24.4-20141103.diff: inline patch for 24.4 from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://plamo.linet.gr.jp/~matsuki/mac/emacs-24.4-inline.patch.bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-src-macim.m.diff: fix for 10.6 or earlier, see #45666
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-inline-24.4-20141103.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-macim.m.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://sakito.jp/emacs/emacs24.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:autoconf port:automake port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target bootstrap
</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:#ffe0e0;'>-variant imagemagick description {Use ImageMagick} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ImageMagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-imagemagick
</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:#ffe0e0;'>-default_variants +inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://ftp.gnu.org/gnu/emacs/?C=M&O=D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex emacs-(\\d+\\.\\d+\\w*)\\.tar
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 31eb9cd..a3fa4f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup muniversal 1.0
PortGroup active_variants 1.1
name emacs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xemacs emacs emacs-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts-delete $subport
</span>
categories editors
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +23,19 @@ homepage http://www.gnu.org/software/emacs/emacs.html
</span> master_sites gnu
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts xemacs emacs-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport emacs-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts xemacs $name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport emacs-app {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts emacs-app-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport emacs-app-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts emacs-app
</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;'>+if {$subport eq $name || $subport eq "emacs-app"} {
</span> version 25.1
checksums rmd160 d29ddba846024c7df3e1dc02ac32690f3650e7b9 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +45,7 @@ if {$subport eq $name} {
</span> patchfiles patch-src_dbusbind.c.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport emacs-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> version 20161031
fetch.type git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,26 +132,28 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-x-toolkit=lucid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x-toolkit=motif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append lib:libXm:openmotif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "emacs" || ${subport} eq "emacs-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-x-toolkit=lucid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-x-toolkit=motif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append lib:libXm:openmotif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gtk requires x11 description {Builds emacs as an X11 program with GTK+2 widgets} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-x-toolkit=lucid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-gconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-rsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x-toolkit=gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-rsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:librsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #21917
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant gtk requires x11 description {Builds emacs as an X11 program with GTK+2 widgets} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-x-toolkit=lucid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-gconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-rsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-x-toolkit=gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-rsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see #21917
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant dbus description {Builds emacs with D-Bus support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,3 +161,54 @@ variant dbus description {Builds emacs with D-Bus support} {
</span> configure.args-append --with-dbus
depends_lib-append port:dbus
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant imagemagick description {Use ImageMagick} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-imagemagick
</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;'>+if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-append aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "emacs-app"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-devel-src_emacs.c.diff
</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;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/src/emacs.c
</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;'>+ configure.args-append --with-ns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "make install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/nextstep/Emacs.app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix read-permission to resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod a+r ${destroot}${applications_dir}/Emacs.app/Contents/Resources/*"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/site-start.el \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
</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;'>+ variant inline description {Apply inline patch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-inline-24.4-20141103.diff: inline patch for 24.4 from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://plamo.linet.gr.jp/~matsuki/mac/emacs-25.1-inline.patch.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-src-macim.m.diff: fix for 10.6 or earlier, see #45666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-inline-25.1-20151017.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-macim.m.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://sakito.jp/emacs/emacs24.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:autoconf port:automake port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target bootstrap
</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;'>+ default_variants +inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/files/nawk.patch b/editors/emacs/files/nawk.patch
</span>similarity index 100%
rename from aqua/emacs-app/files/nawk.patch
rename to editors/emacs/files/nawk.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/files/patch-src_emacs.c.diff b/editors/emacs/files/patch-devel-src_emacs.c.diff
</span>similarity index 78%
copy from aqua/emacs-app/files/patch-src_emacs.c.diff
copy to editors/emacs/files/patch-devel-src_emacs.c.diff
<span style='display:block; white-space:pre;color:#808080;'>index 207695e..58066ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-app/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-devel-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/emacs.c.orig 2014-03-21 14:34:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/emacs.c 2014-12-24 00:02:51.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/emacs.c.orig 2016-11-11 17:20:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/emacs.c 2016-11-12 19:13:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span> #include <stdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span> +#include <string.h>
#include <sys/types.h>
#include <sys/file.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -766,6 +768,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,6 +744,25 @@
</span> #ifdef DARWIN_OS
if (!initialized)
unexec_init_emacs_zone ();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,4 +33,4 @@
</span> + }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- atexit (close_output_streams);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_standard_fds ();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/files/patch-inline-24.4-20141103.diff b/editors/emacs/files/patch-inline-25.1-20151017.diff
</span>similarity index 87%
rename from aqua/emacs-app/files/patch-inline-24.4-20141103.diff
rename to editors/emacs/files/patch-inline-25.1-20151017.diff
<span style='display:block; white-space:pre;color:#808080;'>index d23567f..2469bb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-app/files/patch-inline-24.4-20141103.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-inline-25.1-20151017.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +1,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/configure.ac emacs-24.4/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/configure.ac 2014-10-13 09:14:08.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** configure.ac 2016-07-25 16:08:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 1782,1788 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 1916,1922 ****
</span> INSTALL_ARCH_INDEP_EXTRA=
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o $macfont_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o $ns_fontfile"
</span> fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 1782,1788 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 1916,1922 ----
</span> INSTALL_ARCH_INDEP_EXTRA=
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macim.o $macfont_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o macim.o $ns_fontfile"
</span> fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 4869,4875 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 5123,5129 ****
</span> ## only costs about 1.5K of wasted binary space.
headerpad_extra=1000
if test "$HAVE_NS" = "yes"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ diff -Nrc emacs-24.4.orig/configure.ac emacs-24.4/configure.ac
</span> if test "$NS_IMPL_COCOA" = "yes"; then
libs_nsgui="$libs_nsgui -framework IOKit"
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 4869,4875 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 5123,5129 ----
</span> ## only costs about 1.5K of wasted binary space.
headerpad_extra=1000
if test "$HAVE_NS" = "yes"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +35,12 @@ diff -Nrc emacs-24.4.orig/configure.ac emacs-24.4/configure.ac
</span> if test "$NS_IMPL_COCOA" = "yes"; then
libs_nsgui="$libs_nsgui -framework IOKit"
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/lisp/term/common-win.el emacs-24.4/lisp/term/common-win.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/lisp/term/common-win.el 2014-03-21 14:34:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lisp/term/common-win.el 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc lisp/term/common-win.el lisp/term/common-win.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** lisp/term/common-win.el 2016-06-29 18:49:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lisp/term/common-win.el 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 136,141 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 136,142 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 73,78 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 73,79 ----
</span> (cons (logior (lsh 0 16) 12) 'ns-new-frame)
(cons (logior (lsh 0 16) 13) 'ns-toggle-toolbar)
(cons (logior (lsh 0 16) 14) 'ns-show-prefs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,12 +48,12 @@ diff -Nrc emacs-24.4.orig/lisp/term/common-win.el emacs-24.4/lisp/term/common-wi
</span> ))))
(set-terminal-parameter frame 'x-setup-function-keys t)))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/lisp/term/ns-win.el 2014-03-21 14:34:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lisp/term/ns-win.el 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc lisp/term/ns-win.el lisp/term/ns-win.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** lisp/term/ns-win.el 2016-06-29 18:49:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lisp/term/ns-win.el 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 168,173 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 168,174 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 169,174 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 169,175 ----
</span> (define-key global-map [ns-new-frame] 'make-frame)
(define-key global-map [ns-toggle-toolbar] 'ns-toggle-toolbar)
(define-key global-map [ns-show-prefs] 'customize)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span>
;; Set up a number of aliases and other layers to pretend we're using
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 253,266 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 254,267 ****
</span> ;; editing window.)
(defface ns-working-text-face
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> (defvar ns-working-text) ; nsterm.m
;; Test if in echo area, based on mac-win.el 2007/08/26 unicode-2.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 254,283 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 255,284 ----
</span> ;; editing window.)
(defface ns-working-text-face
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span>
;; Test if in echo area, based on mac-win.el 2007/08/26 unicode-2.
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 268,284 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 269,285 ****
</span> (defun ns-in-echo-area ()
"Whether, for purposes of inserting working composition text, the minibuffer
is currently being used."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +127,7 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span>
;; The 'interactive' here stays for subinvocations, so the ns-in-echo-area
;; always returns nil for some reason. If this WASN'T the case, we could
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 285,303 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 286,304 ----
</span> (defun ns-in-echo-area ()
"Whether, for purposes of inserting working composition text, the minibuffer
is currently being used."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,8 +148,8 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> ;; The 'interactive' here stays for subinvocations, so the ns-in-echo-area
;; always returns nil for some reason. If this WASN'T the case, we could
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 287,292 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 306,312 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 288,293 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 307,313 ----
</span> (defun ns-put-working-text ()
(interactive)
(if (ns-in-echo-area) (ns-echo-working-text) (ns-insert-working-text)))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,7 +158,7 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> (interactive)
(ns-delete-working-text))
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 308,326 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 309,327 ****
</span> (defun ns-echo-working-text ()
"Echo contents of `ns-working-text' in message display area.
See `ns-insert-working-text'."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +178,7 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> (cond
((and (overlayp ns-working-overlay)
;; Still alive?
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 328,408 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 329,409 ----
</span> (defun ns-echo-working-text ()
"Echo contents of `ns-working-text' in message display area.
See `ns-insert-working-text'."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,10 +261,10 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> ((and (overlayp ns-working-overlay)
;; Still alive?
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 964,969 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 1046,1511 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 935,940 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 1017,1562 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &context (window-system ns))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (ns-get-selection selection-symbol target-type))
</span>
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -526,6 +526,86 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> + (title . "半英")
+ (cursor-color)
+ (cursor-type))
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok26.Roman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "A")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok26.Japanese"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "あ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok26.Japanese.Katakana"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "ア")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok26.Japanese.FullWidthRoman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok26.Japanese.HalfWidthEiji"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "半英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok27.Roman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "A")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok27.Japanese"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "あ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok27.Japanese.Katakana"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "ア")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok27.Japanese.FullWidthRoman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok27.Japanese.HalfWidthEiji"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "半英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok28.Roman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "A")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok28.Japanese"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "あ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok28.Japanese.Katakana"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "ア")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok28.Japanese.FullWidthRoman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok28.Japanese.HalfWidthEiji"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "半英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok29.Roman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "A")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok29.Japanese"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "あ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok29.Japanese.Katakana"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "ア")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok29.Japanese.FullWidthRoman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ("com.justsystems.inputmethod.atok29.Japanese.HalfWidthEiji"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (title . "半英")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cursor-type))
</span> + )
+ "Alist of Mac script code vs parameters for input method on MacOSX.")
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -729,11 +809,11 @@ diff -Nrc emacs-24.4.orig/lisp/term/ns-win.el emacs-24.4/lisp/term/ns-win.el
</span> (provide 'ns-win)
;;; ns-win.el ends here
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/Makefile.in emacs-24.4/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/Makefile.in 2014-05-27 00:50:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/Makefile.in src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/Makefile.in 2016-06-29 18:49:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 367,374 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 409,416 ****
</span> SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o dbusbind.o cygw32.o \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -742,7 +822,7 @@ diff -Nrc emacs-24.4.orig/src/Makefile.in emacs-24.4/src/Makefile.in
</span> w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \
xsettings.o xgselect.o termcap.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 367,374 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 409,416 ----
</span> SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o dbusbind.o cygw32.o \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -751,33 +831,33 @@ diff -Nrc emacs-24.4.orig/src/Makefile.in emacs-24.4/src/Makefile.in
</span> w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \
xsettings.o xgselect.o termcap.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/keyboard.c emacs-24.4/src/keyboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/keyboard.c 2014-06-19 23:58:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/keyboard.c 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/keyboard.c src/keyboard.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/keyboard.c 2016-08-02 17:06:01.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keyboard.c 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 3964,3971 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 3875,3882 ****
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (event->code == KEY_NS_PUT_WORKING_TEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (event->ie.code == KEY_NS_PUT_WORKING_TEXT)
</span> obj = list1 (intern ("ns-put-working-text"));
! else
obj = list1 (intern ("ns-unput-working-text"));
kbd_fetch_ptr = event + 1;
if (used_mouse_menu)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *used_mouse_menu = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 3964,3973 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *used_mouse_menu = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3875,3884 ----
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (event->code == KEY_NS_PUT_WORKING_TEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (event->ie.code == KEY_NS_PUT_WORKING_TEXT)
</span> obj = list1 (intern ("ns-put-working-text"));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-! else if (event->code == KEY_NS_UNPUT_WORKING_TEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+! else if (event->ie.code == KEY_NS_UNPUT_WORKING_TEXT)
</span> obj = list1 (intern ("ns-unput-working-text"));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (event->code == KEY_NS_PUT_MARKED_TEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ obj = Fcons (intern ("ns-put-marked-text"), event->arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (event->ie.code == KEY_NS_PUT_MARKED_TEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ obj = Fcons (intern ("ns-put-marked-text"), event->ie.arg);
</span> kbd_fetch_ptr = event + 1;
if (used_mouse_menu)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *used_mouse_menu = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *used_mouse_menu = true;
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 11706,11711 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 11708,11715 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 11743,11748 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 11745,11752 ----
</span> "ns-put-working-text");
initial_define_lispy_key (Vspecial_event_map, "ns-unput-working-text",
"ns-unput-working-text");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -786,9 +866,9 @@ diff -Nrc emacs-24.4.orig/src/keyboard.c emacs-24.4/src/keyboard.c
</span> /* Here we used to use `ignore-event' which would simple set prefix-arg to
current-prefix-arg, as is done in `handle-switch-frame'.
But `handle-switch-frame is not run from the special-map.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/macim.m emacs-24.4/src/macim.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/macim.m 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/macim.m 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/macim.m src/macim.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/macim.m 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macim.m 2016-09-20 02:27:22.000000000 +0900
</span> ***************
*** 0 ****
--- 1,173 ----
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -965,22 +1045,12 @@ diff -Nrc emacs-24.4.orig/src/macim.m emacs-24.4/src/macim.m
</span> + defsubr (&Smac_toggle_input_source);
+ }
+ #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/nsfns.m emacs-24.4/src/nsfns.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/nsfns.m 2014-03-21 14:34:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/nsfns.m 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/nsfns.m src/nsfns.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/nsfns.m 2016-06-29 18:49:22.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nsfns.m 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 546,552 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_set_name_internal (f, name);
</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:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_set_name_as_filename (struct frame *f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 546,551 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 2944,2949 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 2943,2966 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 3136,3141 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3136,3159 ----
</span> doc: /* Toolkit version for NS Windowing. */);
Vns_version_string = ns_appkit_version_str ();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1006,8 +1076,8 @@ diff -Nrc emacs-24.4.orig/src/nsfns.m emacs-24.4/src/nsfns.m
</span> defsubr (&Sns_get_resource);
defsubr (&Sns_set_resource);
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 2987,2992 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 3004,3013 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 3180,3185 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3198,3207 ----
</span> defsubr (&Sx_show_tip);
defsubr (&Sx_hide_tip);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1018,12 +1088,12 @@ diff -Nrc emacs-24.4.orig/src/nsfns.m emacs-24.4/src/nsfns.m
</span> as_status = 0;
as_script = Qnil;
as_result = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/nsterm.h emacs-24.4/src/nsterm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/nsterm.h 2014-07-21 11:28:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/nsterm.h 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/nsterm.h src/nsterm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/nsterm.h 2016-08-22 18:17:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nsterm.h 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 483,488 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 483,490 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 757,762 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 757,764 ----
</span> #define KEY_NS_NEW_FRAME ((1<<28)|(0<<16)|12)
#define KEY_NS_TOGGLE_TOOLBAR ((1<<28)|(0<<16)|13)
#define KEY_NS_SHOW_PREFS ((1<<28)|(0<<16)|14)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1032,12 +1102,12 @@ diff -Nrc emacs-24.4.orig/src/nsterm.h emacs-24.4/src/nsterm.h
</span>
/* could use list to store these, but rest of emacs has a big infrastructure
for managing a table of bitmap "records" */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/nsterm.m 2014-09-12 13:50:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/nsterm.m 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/nsterm.m src/nsterm.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/nsterm.m 2016-08-22 18:17:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nsterm.m 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 4253,4258 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 4253,4261 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 4859,4864 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 4859,4867 ----
</span> /* [[NSNotificationCenter defaultCenter] addObserver: NSApp
selector: @selector (logNotification:)
name: nil object: nil]; */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1048,8 +1118,8 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> dpyinfo = xzalloc (sizeof *dpyinfo);
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 4520,4525 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 4523,4543 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 5162,5167 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 5165,5185 ----
</span> NSLog (@"notification: '%@'", [notification name]);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1072,7 +1142,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> - (void)sendEvent: (NSEvent *)theEvent
/* --------------------------------------------------------------------------
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 5294,5300 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 5985,5991 ****
</span> code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1080,7 +1150,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> && (emacs_event->modifiers != shift_modifier)
&& [[theEvent charactersIgnoringModifiers] length] > 0))
/*[[theEvent characters] length] */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 5312,5319 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 6003,6010 ----
</span> code, fnKeysym, flags, emacs_event->modifiers);
/* if it was a function key or had modifiers, pass it directly to emacs */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1090,7 +1160,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> && [[theEvent charactersIgnoringModifiers] length] > 0))
/*[[theEvent characters] length] */
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 5309,5317 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 6000,6008 ****
</span> ? MULTIBYTE_CHAR_KEYSTROKE_EVENT : ASCII_KEYSTROKE_EVENT;
emacs_event->code = code;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1100,7 +1170,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 5328,5346 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 6019,6037 ----
</span> ? MULTIBYTE_CHAR_KEYSTROKE_EVENT : ASCII_KEYSTROKE_EVENT;
emacs_event->code = code;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1121,7 +1191,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> }
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 5411,5420 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 6098,6107 ****
</span> (unsigned long)selRange.length,
(unsigned long)selRange.location);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1132,7 +1202,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span>
if (!emacs_event)
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 5440,5458 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 6127,6145 ----
</span> (unsigned long)selRange.length,
(unsigned long)selRange.location);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1153,7 +1223,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> if (!emacs_event)
return;
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 5424,5430 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 6111,6117 ****
</span> ns_working_text = build_string ([workingText UTF8String]);
emacs_event->kind = NS_TEXT_EVENT;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1161,7 +1231,7 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> EV_TRAILER ((id)nil);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 5462,5470 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 6149,6157 ----
</span> ns_working_text = build_string ([workingText UTF8String]);
emacs_event->kind = NS_TEXT_EVENT;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1172,11 +1242,14 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> }
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 5479,5493 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 6174,6191 ****
</span> {
NSRect rect;
NSPoint pt;
! struct window *win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSTRACE ("[EmacsView firstRectForCharacterRange:]");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if (NS_KEYLOG)
NSLog (@"firstRectForCharRange request");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1188,12 +1261,15 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span>
pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 5519,5541 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 6214,6239 ----
</span> {
NSRect rect;
NSPoint pt;
! // struct window *win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
! struct window *win;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSTRACE ("[EmacsView firstRectForCharacterRange:]");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if (NS_KEYLOG)
NSLog (@"firstRectForCharRange request");
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1213,8 +1289,8 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> pt = [self convertPoint: pt toView: nil];
pt = [[self window] convertBaseToScreen: pt];
***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 7756,7761 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 7804,7813 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 8782,8787 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 8830,8839 ----
</span> baseline level. The default value is nil. */);
x_underline_at_descent_line = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1225,12 +1301,12 @@ diff -Nrc emacs-24.4.orig/src/nsterm.m emacs-24.4/src/nsterm.m
</span> /* Tell Emacs about this window system. */
Fprovide (Qns, Qnil);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nrc emacs-24.4.orig/src/termhooks.h emacs-24.4/src/termhooks.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** ../emacs-24.4.orig/src/termhooks.h 2014-04-28 04:41:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/termhooks.h 2014-11-03 16:08:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nrc src/termhooks.h src/termhooks.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/termhooks.h 2016-06-29 18:49:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/termhooks.h 2016-09-20 02:27:22.000000000 +0900
</span> ***************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 49,54 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 49,55 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** 59,64 ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 59,65 ----
</span> output_x_window,
output_msdos_raw,
output_w32,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/files/patch-src-macim.m.diff b/editors/emacs/files/patch-src-macim.m.diff
</span>similarity index 100%
rename from aqua/emacs-app/files/patch-src-macim.m.diff
rename to editors/emacs/files/patch-src-macim.m.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/files/patch-src_emacs.c.diff b/editors/emacs/files/patch-src_emacs.c.diff
</span>similarity index 100%
rename from aqua/emacs-app/files/patch-src_emacs.c.diff
rename to editors/emacs/files/patch-src_emacs.c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-app/files/site-start.el b/editors/emacs/files/site-start.el
</span>similarity index 100%
rename from aqua/emacs-app/files/site-start.el
rename to editors/emacs/files/site-start.el
</pre><pre style='margin:0'>
</pre>