Merge branch 'emacs-27' of git.sv.gnu.org:/srv/git/emacs into emacs-27

1 files changed, 4 insertions, 3 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 5f136f03ecf..fca71985b92 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5246,7 +5246,6 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
                                         extra_info)));
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
   else if (f)
     {
       /* Return mouse pixel coordinates here.  */
@@ -5254,7 +5253,9 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
       xret = XFIXNUM (x);
       yret = XFIXNUM (y);
 
-      if (FRAME_LIVE_P (f)
+#ifdef HAVE_WINDOW_SYSTEM
+      if (FRAME_WINDOW_P (f)
+          && FRAME_LIVE_P (f)
           && FRAME_INTERNAL_BORDER_WIDTH (f) > 0
           && !NILP (get_frame_param (f, Qdrag_internal_border)))
         {
@@ -5263,8 +5264,8 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
 
           posn = builtin_lisp_symbol (internal_border_parts[part]);
         }
-    }
 #endif
+    }
 
   else
     window_or_frame = Qnil;