[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d261192 3/3: Merge from origin/emacs-28
|
From: |
Glenn Morris |
|
Subject: |
master d261192 3/3: Merge from origin/emacs-28 |
|
Date: |
Thu, 7 Oct 2021 11:37:52 -0400 (EDT) |
branch: master
commit d2611920685ca415a1d85ffb9567b968518028d6
Merge: 20809e2 7cb98ba
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-28
7cb98ba057 (origin/emacs-28) ; * src/keyboard.c (make_lispy_position)...
---
src/keyboard.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index 4f3232d..9a50a5e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5130,7 +5130,8 @@ make_lispy_position (struct frame *f, Lisp_Object x,
Lisp_Object y,
window_or_frame = Qnil;
}
#endif
- if (!FRAME_WINDOW_P (f)
+ if (f
+ && !FRAME_WINDOW_P (f)
&& FRAME_TAB_BAR_LINES (f) > 0
&& my >= FRAME_MENU_BAR_LINES (f)
&& my < FRAME_MENU_BAR_LINES (f) + FRAME_TAB_BAR_LINES (f))