<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f200968ab84b32222796898db6c7113ec9529eb3">https://github.com/macports/macports-ports/commit/f200968ab84b32222796898db6c7113ec9529eb3</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 f200968 emacs-mac-app: Add a variant for George Plymale's multi-tty support patch
</span>f200968 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f200968ab84b32222796898db6c7113ec9529eb3
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Fri Oct 25 16:57:25 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: Add a variant for George Plymale's multi-tty support patch
</span>---
aqua/emacs-mac-app/Portfile | 4 +++
aqua/emacs-mac-app/files/patch-multi-tty | 55 ++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/Portfile b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a9772c..90e05ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,6 +100,10 @@ post-destroot {
</span> ${destroot}${applications_dir}/EmacsMac.app
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant multitty description {Enable Multi-TTY support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-multi-tty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant rsvg description {Enable librsvg bindings} {
depends_lib-append port:librsvg
configure.args-delete --without-rsvg
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-multi-tty b/aqua/emacs-mac-app/files/patch-multi-tty
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4118c73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/patch-multi-tty
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+George D. Plymale II's multi-tty support patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lisp/server.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lisp/server.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1175,10 +1175,9 @@ The following commands are accepted by the client:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; choice there.) In daemon mode on Windows, we can't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; make tty frames, so force the frame type to GUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; there too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (when (or (and (eq system-type 'windows-nt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (or (daemonp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (eq window-system 'w32)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (eq window-system 'mac))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (when (and (eq system-type 'windows-nt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (or (daemonp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eq window-system 'w32)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (push "-window-system" args-left)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; -position LINE[:COLUMN]: Set point to the given
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1213,12 +1213,8 @@ affects all frames on the same terminal device. */)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ emacs_abort ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* not MSDOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined (WINDOWSNT) || defined (HAVE_MACGUI) /* This should work now! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sf->output_method != output_termcap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_MACGUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && sf->output_method != output_initial
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef WINDOWSNT /* This should work now! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sf->output_method != output_termcap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error ("Not using an ASCII terminal now; cannot make a new ASCII frame");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* not MSDOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macterm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macterm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3114,6 +3114,7 @@ mac_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct frame *f1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct frame *sf = SELECTED_FRAME ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ block_input ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3130,7 +3131,7 @@ mac_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1 = mac_focus_frame (FRAME_DISPLAY_INFO (*fp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (f1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (f1 && sf->output_method != output_termcap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Ok, we found a frame. Store all the values.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ last_mouse_glyph is a rectangle used to reduce the
</span></pre><pre style='margin:0'>
</pre>