bug#55861: [PATCH] Update native-comp error message to reflect variable change

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Fejfighter]

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

Updates a Native-compilation error message to make debugging user init
files much easier.

The referenced variable got renamed sometime during integration, this just
got missed somehow.

My paperwork is done, but this should be small enough anyway

Thanks

Jeff W

[-- Attachment #2: Type: text/html, Size: 397 bytes --]

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Eli Zaretskii]

> From: Fejfighter <fejfighter@gmail.com>
> Date: Thu, 9 Jun 2022 10:17:48 +1000
> 
> Updates a Native-compilation error message to make debugging user init
> files much easier.
> 
> The referenced variable got renamed sometime during integration, this just
> got missed somehow.

ENOPATCH

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Fejfighter]

[-- Attachment #1.1: Type: text/plain, Size: 379 bytes --]

On Thu, Jun 9, 2022 at 3:32 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Fejfighter <fejfighter@gmail.com>
> > Date: Thu, 9 Jun 2022 10:17:48 +1000
> >
> > Updates a Native-compilation error message to make debugging user init
> > files much easier.
> >
> > The referenced variable got renamed sometime during integration, this
> just
> > got missed somehow.
>
> ENOPATCH
>

[-- Attachment #1.2: Type: text/html, Size: 774 bytes --]

[-- Attachment #2: 0001-Update-error-message-to-reflect-variable-rename.patch --]
[-- Type: text/x-patch, Size: 769 bytes --]

From 940357a6ec07527609784d7d5515bfa9b45096d0 Mon Sep 17 00:00:00 2001
From: Jeff Walsh <fejfighter@gmail.com>
Date: Thu, 9 Jun 2022 10:02:01 +1000
Subject: [PATCH] Update error message to reflect variable rename

* src/comp.c (Fcomp_el_to_eln_filename): update mesage
---
 src/comp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/comp.c b/src/comp.c
index 97bc6a5f9d..05d9fed448 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4466,7 +4466,7 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename,
 	}
       if (NILP (base_dir))
 	error ("Cannot find suitable directory for output in "
-	       "`comp-native-load-path'.");
+	       "`native-comp-eln-load-path'.");
     }
 
   if (!file_name_absolute_p (SSDATA (base_dir)))
-- 
2.36.1

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Andrea Corallo]

Fejfighter <fejfighter@gmail.com> writes:

> On Thu, Jun 9, 2022 at 3:32 PM Eli Zaretskii <eliz@gnu.org> wrote:
>
>  > From: Fejfighter <fejfighter@gmail.com>
>  > Date: Thu, 9 Jun 2022 10:17:48 +1000
>  > 
>  > Updates a Native-compilation error message to make debugging user init
>  > files much easier.
>  > 
>  > The referenced variable got renamed sometime during integration, this just
>  > got missed somehow.
>
>  ENOPATCH

Hi,

pushed as ec987e3e17.

Thanks

  Andrea

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Eli Zaretskii]

> From: Andrea Corallo <akrl@sdf.org>
> Cc: Eli Zaretskii <eliz@gnu.org>, 55861@debbugs.gnu.org
> Date: Thu, 09 Jun 2022 06:37:20 +0000
> 
> Fejfighter <fejfighter@gmail.com> writes:
> 
> > On Thu, Jun 9, 2022 at 3:32 PM Eli Zaretskii <eliz@gnu.org> wrote:
> >
> >  > From: Fejfighter <fejfighter@gmail.com>
> >  > Date: Thu, 9 Jun 2022 10:17:48 +1000
> >  > 
> >  > Updates a Native-compilation error message to make debugging user init
> >  > files much easier.
> >  > 
> >  > The referenced variable got renamed sometime during integration, this just
> >  > got missed somehow.
> >
> >  ENOPATCH
> 
> Hi,
> 
> pushed as ec987e3e17.

Thanks, but that was a mistake: the problem exists in Emacs 28.1 as
well, so this change should have been installed on the release branch
instead.

So I have now installed it on the release branch, and reverted the
change on master to avoid merge conflicts.

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Andrea Corallo]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Andrea Corallo <akrl@sdf.org>
>> Cc: Eli Zaretskii <eliz@gnu.org>, 55861@debbugs.gnu.org
>> Date: Thu, 09 Jun 2022 06:37:20 +0000
>> 
>> Fejfighter <fejfighter@gmail.com> writes:
>> 
>> > On Thu, Jun 9, 2022 at 3:32 PM Eli Zaretskii <eliz@gnu.org> wrote:
>> >
>> >  > From: Fejfighter <fejfighter@gmail.com>
>> >  > Date: Thu, 9 Jun 2022 10:17:48 +1000
>> >  > 
>> >  > Updates a Native-compilation error message to make debugging user init
>> >  > files much easier.
>> >  > 
>> >  > The referenced variable got renamed sometime during integration, this just
>> >  > got missed somehow.
>> >
>> >  ENOPATCH
>> 
>> Hi,
>> 
>> pushed as ec987e3e17.
>
> Thanks, but that was a mistake: the problem exists in Emacs 28.1 as
> well, so this change should have been installed on the release branch
> instead.
>
> So I have now installed it on the release branch, and reverted the
> change on master to avoid merge conflicts.

Right, thanks!

  Andrea

bug#55861: [PATCH] Update native-comp error message to reflect variable change

[Eli Zaretskii]

> From: Fejfighter <fejfighter@gmail.com>
> Date: Thu, 9 Jun 2022 16:06:26 +1000
> Cc: 55861@debbugs.gnu.org
> 
> From 940357a6ec07527609784d7d5515bfa9b45096d0 Mon Sep 17 00:00:00 2001
> From: Jeff Walsh <fejfighter@gmail.com>
> Date: Thu, 9 Jun 2022 10:02:01 +1000
> Subject: [PATCH] Update error message to reflect variable rename
> 
> * src/comp.c (Fcomp_el_to_eln_filename): update mesage

Thanks, installed on the release branch.

Please in the future make sure the commit log message is according to
our conventions: the description of the individual changes should be
one or more complete sentences, starting with a capital letter and
ending with a period.  It also should mention the bug number (when you
know it).