[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/igc 65689eff0c8 1/2: Revert "* src/frame.h (MOUSE_HL_INFO): Retz
|
From: |
Gerd Moellmann |
|
Subject: |
scratch/igc 65689eff0c8 1/2: Revert "* src/frame.h (MOUSE_HL_INFO): Retzrn NULL if output data is NULL." |
|
Date: |
Thu, 5 Sep 2024 15:18:26 -0400 (EDT) |
branch: scratch/igc
commit 65689eff0c8328720ea9b36efce0af7d8af66da8
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>
Revert "* src/frame.h (MOUSE_HL_INFO): Retzrn NULL if output data is NULL."
This reverts commit c32ea49de92b4231f37bbc6d38055539d86efcef.
---
src/frame.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/frame.h b/src/frame.h
index 473d90af353..3abf08f6292 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1021,11 +1021,9 @@ default_pixels_per_inch_y (void)
does not have FRAME_DISPLAY_INFO. */
#ifdef HAVE_WINDOW_SYSTEM
#ifndef HAVE_ANDROID
-# define MOUSE_HL_INFO(F) \
+# define MOUSE_HL_INFO(F) \
(FRAME_WINDOW_P (F) \
- ? (FRAME_OUTPUT_DATA (F) \
- ? &FRAME_DISPLAY_INFO (F)->mouse_highlight \
- : NULL) \
+ ? &FRAME_DISPLAY_INFO(F)->mouse_highlight \
: &(F)->output_data.tty->display_info->mouse_highlight)
#else
/* There is no "struct tty_output" on Android at all. */