emacs-mac-app-devel @20231116 +multitty: fails in patch phase

[rottegift (Sean Doran)]

multitty variant patch file fails for emacs-mac-app-devel commit 5eef3cec8e920f89766080149f56f7c630b97649 update to 2023-11-16

log attached for "port patch emacs-mac-app-devel +multitty"

src/macterm.c.rej:

@@ -2946,6 +2946,7 @@
 {
   struct frame *f1;
   struct mac_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
+  struct frame *sf = SELECTED_FRAME ();

   block_input ();

@@ -2966,7 +2967,7 @@
     else
       f1 = XFRAME (mac_event_frame ());

-    if (f1)
+    if (f1 && sf->output_method != output_termcap)
       {
        /* Ok, we found a frame.  Store all the values.
           last_mouse_glyph is a rectangle used to reduce the

lisp/server.el.rej

@@ -1182,10 +1182,9 @@
                  ;; choice there.)  In daemon mode on Windows, we can't
                  ;; make tty frames, so force the frame type to GUI
                  ;; there too.
-                 (when (or (and (eq system-type 'windows-nt)
-                                (or (daemonp)
-                                    (eq window-system 'w32)))
-                           (eq window-system 'mac))
+                 (when (and (eq system-type 'windows-nt)
+                            (or (daemonp)
+                                (eq window-system 'w32)))
                    (push "-window-system" args-left)))

                 ;; -position +LINE[:COLUMN]:  Set point to the given

[rottegift (Sean Doran)]

"port patch emacs-mac-app-devel +multitty' log

[ryandesign (Ryan Carsten Schmidt)]

Duplicate of #67908.