Re: master 22bee93d92: Update error message to reflect variable rename

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sat, 03 Sep 2022 14:04:07 -0400
> 
> > It was automatically skipped, but I don't understand why.
> 
> I don't know either.

I think it's because of the below (in which case I think it's a bug in
gitmerge.el).  Ironically, I did that because I wanted to prevent
merge conflicts.

I think the lesson here is that we should more closely eyeball the
commits gitmerge says it will skip.

commit d18e60fef172cf38b92108144f54ed10ddf67488
Author:     Eli Zaretskii <eliz@gnu.org>
AuthorDate: Thu Jun 9 09:56:59 2022 +0300
Commit:     Eli Zaretskii <eliz@gnu.org>
CommitDate: Thu Jun 9 09:56:59 2022 +0300

    Revert "* src/comp.c (Fcomp_el_to_eln_filename): Update error message."
    
    This reverts commit ec987e3e1786d06ffd306e5717b4d7fd118f05ac.
    This change was installed on the emacs-28 branch instead.

diff --git a/src/comp.c b/src/comp.c
index 05d9fed..97bc6a5 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 "
-              "`native-comp-eln-load-path'.");
+              "`comp-native-load-path'.");
     }
 
   if (!file_name_absolute_p (SSDATA (base_dir)))