Re: master build broken on macOS

[Jim Porter <jporterbugs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On 6/9/2022 7:53 AM, Filipp Gunbin wrote:
> window.c:1021:11: error: invalid operands to binary expression ('Lisp_Object' (aka 'struct Lisp_Object') and 'Lisp_Object')
>      (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
>       ~~~~ ^  ~~~~~~
> 1 error generated.

Oops. I think this should do the trick?

[-- Attachment #2: 0001-src-window.c-window_body_unit_from_symbol-Use-EQ-ins.patch --]
[-- Type: text/plain, Size: 793 bytes --]

From 3e68b0b22e518e55167ee70425ac0ff97efa35e1 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Thu, 9 Jun 2022 08:47:42 -0700
Subject: [PATCH] ; * src/window.c (window_body_unit_from_symbol): Use 'EQ'
 instead of ==.

---
 src/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/window.c b/src/window.c
index e5666ce38e..dae9a29387 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1018,7 +1018,7 @@ DEFUN ("window-top-line", Fwindow_top_line, Swindow_top_line, 0, 1, 0,
 window_body_unit_from_symbol (Lisp_Object unit)
 {
   return
-    (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
+    (EQ (unit, Qremap) ? WINDOW_BODY_IN_REMAPPED_CHARS
      : NILP (unit) ? WINDOW_BODY_IN_CANONICAL_CHARS
      : WINDOW_BODY_IN_PIXELS);
 }
-- 
2.25.1