all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Jim Porter <jporterbugs@gmail.com>
To: emacs-devel@gnu.org
Subject: Re: master build broken on macOS
Date: Thu, 9 Jun 2022 08:49:56 -0700	[thread overview]
Message-ID: <91a75bdb-1e68-723b-98d9-195b02040796@gmail.com> (raw)
In-Reply-To: <m235gdnb14.fsf@fastmail.fm>

[-- 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


  reply	other threads:[~2022-06-09 15:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-09 14:53 master build broken on macOS Filipp Gunbin
2022-06-09 15:49 ` Jim Porter [this message]
2022-06-09 17:51   ` Eli Zaretskii
2022-06-09 16:41 ` Eli Zaretskii
2022-06-09 17:28   ` Filipp Gunbin
  -- strict thread matches above, loose matches on Subject: below --
2021-11-16 12:59 Filipp Gunbin
2021-11-16 13:04 ` Po Lu
2021-11-16 13:11   ` Lars Ingebrigtsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=91a75bdb-1e68-723b-98d9-195b02040796@gmail.com \
    --to=jporterbugs@gmail.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.