<!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>[141495] trunk/dports/aqua/emacs-mac-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/141495">141495</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2015-10-19 15:03:20 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>emacs-mac-app: update to 5.11</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaemacsmacappPortfile">trunk/dports/aqua/emacs-mac-app/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquaemacsmacappfilespatchsrc_compositecdiff">trunk/dports/aqua/emacs-mac-app/files/patch-src_composite.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaemacsmacappPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/emacs-mac-app/Portfile (141494 => 141495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/emacs-mac-app/Portfile 2015-10-19 22:03:18 UTC (rev 141494)
+++ trunk/dports/aqua/emacs-mac-app/Portfile 2015-10-19 22:03:20 UTC (rev 141495)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name emacs-mac-app
</span><del>-version 5.9
</del><ins>+version 5.11
</ins><span class="cx"> categories aqua editors
</span><span class="cx"> maintainers hum openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url http://www.math.s.chiba-u.ac.jp/~mituharu/emacs-mac.git
</span><del>-git.branch 4f16f12a23fd34148f8e161d6a08a1d8b4674294
</del><ins>+git.branch fe3ef2311ee7d3e73d43e46c19426c37653e0ccb
</ins><span class="cx">
</span><span class="cx"> depends_lib port:ncurses \
</span><span class="cx"> port:libxml2 \
</span><span class="lines">@@ -30,8 +30,7 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:autoconf port:automake port:libtool
</span><span class="cx">
</span><del>-patchfiles patch-src_emacs.c.diff \
- patch-src_composite.c.diff
</del><ins>+patchfiles patch-src_emacs.c.diff
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaquaemacsmacappfilespatchsrc_compositecdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/emacs-mac-app/files/patch-src_composite.c.diff (141494 => 141495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/emacs-mac-app/files/patch-src_composite.c.diff 2015-10-19 22:03:18 UTC (rev 141494)
+++ trunk/dports/aqua/emacs-mac-app/files/patch-src_composite.c.diff 2015-10-19 22:03:20 UTC (rev 141495)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-diff --git a/src/composite.c b/src/composite.c
-index d158f04..55e7faa 100644
---- src/composite.c.orig
-+++ src/composite.c
-@@ -1755,25 +1755,49 @@ should be ignored. */)
-
- if (NILP (string))
- {
-- if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
-- error ("Attempt to shape unibyte text");
- validate_region (&from, &to);
- frompos = XFASTINT (from);
- topos = XFASTINT (to);
-- frombyte = CHAR_TO_BYTE (frompos);
-+ if (!NILP (BVAR (current_buffer, enable_multibyte_characters)))
-+ frombyte = CHAR_TO_BYTE (frompos);
-+ else
-+ {
-+ ptrdiff_t pos;
-+
-+ /* fill_gstring_header below uses
-+ FETCH_CHAR_ADVANCE_NO_CHECK that assumes the current
-+ buffer is multibyte, but it is safe as long as it only
-+ fetches ASCII chars. */
-+ for (pos = frompos; pos < topos; pos++)
-+ if (!ASCII_BYTE_P (*(BYTE_POS_ADDR (pos))))
-+ error ("Attempt to shape non-ASCII part of unibyte text");
-+ frombyte = frompos;
-+ }
- }
- else
- {
- CHECK_NATNUM (from);
- CHECK_NATNUM (to);
- CHECK_STRING (string);
-- if (! STRING_MULTIBYTE (string))
-- error ("Attempt to shape unibyte text");
- if (! (XINT (from) <= XINT (to) && XINT (to) <= SCHARS (string)))
- args_out_of_range_3 (string, from, to);
- frompos = XFASTINT (from);
- topos = XFASTINT (to);
-- frombyte = string_char_to_byte (string, frompos);
-+ if (STRING_MULTIBYTE (string))
-+ frombyte = string_char_to_byte (string, frompos);
-+ else
-+ {
-+ ptrdiff_t pos;
-+
-+ /* fill_gstring_header below uses
-+ FETCH_STRING_CHAR_ADVANCE_NO_CHECK that assumes the
-+ string is multibyte, but it is safe as long as it only
-+ fetches ASCII chars. */
-+ for (pos = frompos; pos < topos; pos++)
-+ if (!ASCII_BYTE_P (SREF (string, pos)))
-+ error ("Attempt to shape non-ASCII part of unibyte text");
-+ frombyte = frompos;
-+ }
- }
-
- header = fill_gstring_header (Qnil, frompos, frombyte,
</del></span></pre>
</div>
</div>
</body>
</html>