<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/d8d68785df8fe32ef6f7c85e2fe299dd7d3c9a7c">https://github.com/macports/macports-ports/commit/d8d68785df8fe32ef6f7c85e2fe299dd7d3c9a7c</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 d8d68785df8 emacs-mac-app: update the multi-tty support patch for emacs-27
</span>d8d68785df8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d8d68785df8fe32ef6f7c85e2fe299dd7d3c9a7c
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Tue Aug 11 17:00:52 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: update the multi-tty support patch for emacs-27
</span>---
aqua/emacs-mac-app/files/patch-multi-tty | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
<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><span style='display:block; white-space:pre;color:#808080;'>index 4118c7317c2..d2427252582 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-multi-tty
</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;'>@@ -3,7 +3,7 @@ https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span>
--- lisp/server.el
+++ lisp/server.el
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1175,10 +1175,9 @@ The following commands are accepted by the client:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1182,10 +1182,9 @@ The following commands are accepted by the client:
</span> ;; choice there.) In daemon mode on Windows, we can't
;; make tty frames, so force the frame type to GUI
;; there too.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,14 +16,14 @@ https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span> + (eq window-system 'w32)))
(push "-window-system" args-left)))
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ;; -position LINE[:COLUMN]: Set point to the given
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; -position +LINE[:COLUMN]: Set point to the given
</span> --- src/frame.c
+++ src/frame.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1213,12 +1213,8 @@ affects all frames on the same terminal device. */)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1267,12 +1267,8 @@ affects all frames on the same terminal device. */)
</span> emacs_abort ();
#else /* not MSDOS */
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined (WINDOWSNT) || defined (HAVE_MACGUI) /* This should work now! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined WINDOWSNT || defined HAVE_MACGUI /* This should work now! */
</span> - if (sf->output_method != output_termcap
-#ifdef HAVE_MACGUI
- && sf->output_method != output_initial
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,17 +36,17 @@ https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span> #endif /* not MSDOS */
--- src/macterm.c
+++ src/macterm.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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;'>+@@ -2946,6 +2946,7 @@ mac_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
</span> {
struct frame *f1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mac_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
</span> + struct frame *sf = SELECTED_FRAME ();
block_input ();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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;'>+@@ -2966,7 +2967,7 @@ mac_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- f1 = mac_focus_frame (FRAME_DISPLAY_INFO (*fp));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1 = XFRAME (mac_event_frame ());
</span>
- if (f1)
+ if (f1 && sf->output_method != output_termcap)
</pre><pre style='margin:0'>
</pre>