[PATCH] Fix misnamed variable breaking GNUstep Emacs.app build

[PATCH] Fix misnamed variable breaking GNUstep Emacs.app build

[Ahmed Khanzada]

After a recent refactor of ns_set_offset in nsterm.m, I noticed that the
latest version of Emacs was not compiling under GNUstep.

I believe that this patch should fix the problem, but it could use review
from someone more familiar with the code. Emacs now compiles fine, and I
am writing this very email in an Emacs compiled with this patch.

Additionally, if you need any help maintaining Emacs.app under GNUstep,
please reach out to me. I am very interested, and I have already signed
legal documents with the FSF to contribute to Emacs (and soon, GNUstep)

diff --git a/src/nsterm.m b/src/nsterm.m
index 9cd1c9d860..5eb44639f5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1875,7 +1875,7 @@ Hide the window (X11 semantics)
 
          FIXME: Surely there's a better way than just hardcoding 100
          in here?  */
-      boundsRect.origin.x = 100;
+      topLeft.x = 100;
 #endif
     }
 

Re: [PATCH] Fix misnamed variable breaking GNUstep Emacs.app build

[Alan Third]

On Fri, Apr 17, 2020 at 04:14:39PM -0700, Ahmed Khanzada wrote:
> After a recent refactor of ns_set_offset in nsterm.m, I noticed that the
> latest version of Emacs was not compiling under GNUstep.
> 
> I believe that this patch should fix the problem, but it could use review
> from someone more familiar with the code. Emacs now compiles fine, and I
> am writing this very email in an Emacs compiled with this patch.

The fix looks good to me. If you want to create a proper patch (as
described in CONTRIBUTE) I’ll happily push it to the repository for
you.

> Additionally, if you need any help maintaining Emacs.app under GNUstep,
> please reach out to me. I am very interested, and I have already signed
> legal documents with the FSF to contribute to Emacs (and soon, GNUstep)

Any help with the NS port would be greatly appreciated. We do keep
compatibility with GNUstep, but most NS port development happens on
macOS, so silly mistakes in GNUstep code, like this one, tend to be
overlooked for a while.

Even raising bug reports for GNUstep would be a plus, since we seem to
have almost no users, and the only people who notice problems are
Emacs devs doing test builds.
-- 
Alan Third

Re: [PATCH] Fix misnamed variable breaking GNUstep Emacs.app build

[Ahmed Khanzada]

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

On Sat, 18 Apr 2020 05:30:31 -0700,
The result of the git format patch -1 is attached to this email.

Sorry for the inline patch, that is just how OpenBSD prefers it. Should
all patches be attachments going forward, or just the end stages before
ommit? Inline is sometimes easier to review.


[-- Attachment #2: 0001-Fix-misnamed-variable-breaking-GNUstep-Emacs.app.patch --]
[-- Type: text/plain, Size: 641 bytes --]

From 2fa8915eacf2b5f1315f5cac025f53af9a3a7efe Mon Sep 17 00:00:00 2001
From: Ahmed Khanzada <lenzuru@gmail.com>
Date: Sat, 18 Apr 2020 12:15:17 -0700
Subject: [PATCH] Fix misnamed variable breaking GNUstep Emacs.app

---
 src/nsterm.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 9cd1c9d860..5eb44639f5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1875,7 +1875,7 @@ Hide the window (X11 semantics)
 
          FIXME: Surely there's a better way than just hardcoding 100
          in here?  */
-      boundsRect.origin.x = 100;
+      topLeft.x = 100;
 #endif
     }
 
-- 
2.22.0


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

Re: [PATCH] Fix misnamed variable breaking GNUstep Emacs.app build

[Alan Third]

On Sat, Apr 18, 2020 at 12:19:11PM -0700, Ahmed Khanzada wrote:
> On Sat, 18 Apr 2020 05:30:31 -0700,
> The result of the git format patch -1 is attached to this email.
> 
> Sorry for the inline patch, that is just how OpenBSD prefers it. Should
> all patches be attachments going forward, or just the end stages before
> ommit? Inline is sometimes easier to review.

For discussion, if it’s not too big, inline is probably as good as
anything. In this particular case I was just hoping you’d write the
commit message. I suppose I wasn’t clear. If you look in the
CONTRIBUTE file there’s information about the preferred format. It’s
worth checking it out if you’re planning on contributing again.

I’ll sort this patch and push it to master.

Thanks!

-- 
Alan Third