<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[116837] trunk/dports/aqua/emacs-app</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/116837">116837</a></dd>
<dt>Author</dt> <dd>hum@macports.org</dd>
<dt>Date</dt> <dd>2014-02-08 04:44:48 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>emacs-app: add patchfiles for Mavericks; see #41224 and #42383.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaemacsappPortfile">trunk/dports/aqua/emacs-app/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaemacsappfilespatchmaverickshomediff">trunk/dports/aqua/emacs-app/files/patch-mavericks-home.diff</a></li>
<li><a href="#trunkdportsaquaemacsappfilespatchmavericksmemleakdiff">trunk/dports/aqua/emacs-app/files/patch-mavericks-memleak.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaemacsappPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/emacs-app/Portfile (116836 => 116837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/emacs-app/Portfile 2014-02-08 12:34:59 UTC (rev 116836)
+++ trunk/dports/aqua/emacs-app/Portfile 2014-02-08 12:44:48 UTC (rev 116837)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name emacs-app
</span><span class="cx"> version 24.3
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories aqua editors
</span><span class="cx"> maintainers hum css openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -38,6 +38,11 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src_emacs.c.diff
</span><span class="cx">
</span><ins>+if {${os.platform} == "darwin" && ${os.major} >= 13} {
+ patchfiles-append patch-mavericks-home.diff \
+ patch-mavericks-memleak.diff
+}
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/src/emacs.c
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsaquaemacsappfilespatchmaverickshomediff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/emacs-app/files/patch-mavericks-home.diff (0 => 116837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/emacs-app/files/patch-mavericks-home.diff (rev 0)
+++ trunk/dports/aqua/emacs-app/files/patch-mavericks-home.diff 2014-02-08 12:44:48 UTC (rev 116837)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- src/emacs.c.orig 2011-01-09 02:45:14.000000000 +0900
++++ src/emacs.c 2011-09-09 23:13:44.000000000 +0900
+@@ -1156,10 +1156,13 @@
+ if (!noninteractive)
+ {
+ #ifdef NS_IMPL_COCOA
+- if (skip_args < argc)
++ /* Started from GUI? */
++ /* FIXME: Do the right thing if getenv returns NULL, or if
++ chdir fails. */
++ if (! inhibit_window_system && ! isatty (0))
++ chdir (getenv ("HOME"));
++ if (skip_args < argc)
+ {
+- /* FIXME: Do the right thing if getenv returns NULL, or if
+- chdir fails. */
+ if (!strncmp (argv[skip_args], "-psn", 4))
+ {
+ skip_args += 1;
</ins></span></pre></div>
<a id="trunkdportsaquaemacsappfilespatchmavericksmemleakdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/emacs-app/files/patch-mavericks-memleak.diff (0 => 116837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/emacs-app/files/patch-mavericks-memleak.diff (rev 0)
+++ trunk/dports/aqua/emacs-app/files/patch-mavericks-memleak.diff 2014-02-08 12:44:48 UTC (rev 116837)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+--- src/nsterm.h
++++ src/nsterm.h
+@@ -55,6 +55,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+ /* We override sendEvent: as a means to stop/start the event loop */
+ @interface EmacsApp : NSApplication
+ {
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
++ BOOL shouldKeepRunning;
++ BOOL isFirst;
++#endif
+ }
+ - (void)logNotification: (NSNotification *)notification;
+ - (void)sendEvent: (NSEvent *)theEvent;
+diff --git a/src/nsterm.m b/src/nsterm.m
+index a57e744..324f065 100644
+--- src/nsterm.m
++++ src/nsterm.m
+@@ -3373,7 +3373,7 @@ ns_read_socket (struct terminal *terminal, struct input_event *hold_quit)
+ if ([NSApp modalWindow] != nil)
+ return -1;
+
+- if (hold_event_q.nr > 0)
++ if (hold_event_q.nr > 0)
+ {
+ int i;
+ for (i = 0; i < hold_event_q.nr; ++i)
+@@ -3447,7 +3447,7 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
+
+ /* NSTRACE (ns_select); */
+
+- if (hold_event_q.nr > 0)
++ if (hold_event_q.nr > 0)
+ {
+ /* We already have events pending. */
+ kill (0, SIGIO);
+@@ -4270,6 +4270,46 @@ ns_term_shutdown (int sig)
+
+ @implementation EmacsApp
+
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
++- (id)init
++{
++ if (self = [super init])
++ self->isFirst = YES;
++
++ return self;
++}
++
++- (void)run
++{
++ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
++
++ if (isFirst) [self finishLaunching];
++ isFirst = NO;
++
++ shouldKeepRunning = YES;
++ do
++ {
++ [pool release];
++ pool = [[NSAutoreleasePool alloc] init];
++
++ NSEvent *event =
++ [self nextEventMatchingMask:NSAnyEventMask
++ untilDate:[NSDate distantFuture]
++ inMode:NSDefaultRunLoopMode
++ dequeue:YES];
++ [self sendEvent:event];
++ [self updateWindows];
++ } while (shouldKeepRunning);
++
++ [pool release];
++}
++
++- (void)stop: (id)sender
++{
++ shouldKeepRunning = NO;
++}
++#endif
++
+ - (void)logNotification: (NSNotification *)notification
+ {
+ const char *name = [[notification name] UTF8String];
</ins></span></pre>
</div>
</div>
</body>
</html>