summaryrefslogtreecommitdiff
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2021-10-07 08:37:46 -0700
committerGlenn Morris <rgm@gnu.org>2021-10-07 08:37:46 -0700
commitd2611920685ca415a1d85ffb9567b968518028d6 (patch)
tree90d62f8cf328a63cfec5bd3dc21544ec5b20709f /src/keyboard.c
parent20809e27cc213e46eb1f234cad605bc8b1ed659d (diff)
parent7cb98ba057cbf5b5da8c86d96e15f46628e95590 (diff)
downloademacs-d2611920685ca415a1d85ffb9567b968518028d6.tar.gz
emacs-d2611920685ca415a1d85ffb9567b968518028d6.tar.bz2
emacs-d2611920685ca415a1d85ffb9567b968518028d6.zip
Merge from origin/emacs-28
7cb98ba057 (origin/emacs-28) ; * src/keyboard.c (make_lispy_position)...
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 4f3232dc46c..9a50a5e5eb7 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))