bug#53853: [PATCH] Don't use string-replace in flymake

bug#53853: [PATCH] Don't use string-replace in flymake

[Brian Leung]

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

Tags: patch

Tags: patch

See attached. Older Emacsen don't have string-replace.

In GNU Emacs 28.0.91 (build 1, aarch64-apple-darwin21.3.0, Carbon Version 165 AppKit 2113.3)
 of 2022-02-02 built on Brians-Mac-mini.local
Windowing system distributor 'Apple Inc.', version 12.2.0
System Description:  macOS 12.2

Configured using:
 'configure --enable-locallisppath=/opt/homebrew/share/emacs/site-lisp
 --infodir=/opt/homebrew/Cellar/emacs-mac/HEAD-674407f/share/info/emacs
 --prefix=/opt/homebrew/Cellar/emacs-mac/HEAD-674407f --with-mac
 --enable-mac-app=/opt/homebrew/Cellar/emacs-mac/HEAD-674407f
 --with-gnutls --with-modules --with-native-compilation
 'CFLAGS=-I/opt/homebrew/opt/gcc/include
 -I/opt/homebrew/opt/libgccjit/include'
 'LDFLAGS=-L/opt/homebrew/lib/gcc/11 -I/opt/homebrew/opt/gcc/include
 -I/opt/homebrew/opt/libgccjit/include''


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Don-t-use-string-replace-in-flymake.patch --]
[-- Type: text/patch, Size: 1149 bytes --]

From e08cd430e2c0acbf063ad2d6a2d8d093745a5c7c Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 7 Feb 2022 07:56:13 -0800
Subject: [PATCH] Don't use string-replace in flymake

* lisp/progmodes/flymake.el (flymake--log-1): Stay compatible with
older Emacsen.
---
 lisp/progmodes/flymake.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0c16ddedcb..e369cb1f21 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -267,8 +267,8 @@ If set to nil, don't suppress any zero counters."
          (format " [%s %s]"
                  (or sublog 'flymake)
                  ;; Handle file names with "%" correctly.  (Bug#51549)
-                 (string-replace "%" "%%"
-                                 (buffer-name (current-buffer))))))
+                 (replace-regexp-in-string "%" "%%"
+                                           (buffer-name (current-buffer))))))
     (display-warning (list 'flymake sublog)
                      (apply #'format-message msg args)
                      (if (numberp level)
-- 
2.34.1

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Mon, 07 Feb 2022 16:11:28 +0000, Brian Leung <leungbk@posteo.net> said:

    Brian> From e08cd430e2c0acbf063ad2d6a2d8d093745a5c7c Mon Sep 17 00:00:00 2001
    Brian> From: Brian Leung <leungbk@posteo.net>
    Brian> Date: Mon, 7 Feb 2022 07:56:13 -0800
    Brian> Subject: [PATCH] Don't use string-replace in flymake

    Brian> * lisp/progmodes/flymake.el (flymake--log-1): Stay compatible with
    Brian> older Emacsen.

This bit is the 'why', and thus needs to be in the preamble. In the
ChangeLog entry you should explain what change youʼre making "use
replace-regexp-in-string instead..." .  And please put (Bug#53853)
somewhere in the commit message.

    Brian> ---
    Brian>  lisp/progmodes/flymake.el | 4 ++--
    Brian>  1 file changed, 2 insertions(+), 2 deletions(-)

    Brian> diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
    Brian> index 0c16ddedcb..e369cb1f21 100644
    Brian> --- a/lisp/progmodes/flymake.el
    Brian> +++ b/lisp/progmodes/flymake.el
    Brian> @@ -267,8 +267,8 @@ If set to nil, don't suppress any zero counters."
    Brian>           (format " [%s %s]"
    Brian>                   (or sublog 'flymake)
    Brian>                   ;; Handle file names with "%" correctly.  (Bug#51549)
    Brian> -                 (string-replace "%" "%%"
    Brian> -                                 (buffer-name (current-buffer))))))
    Brian> +                 (replace-regexp-in-string "%" "%%"
    Brian> +                                           (buffer-name (current-buffer))))))
    Brian>      (display-warning (list 'flymake sublog)
    Brian>                       (apply #'format-message msg args)
    Brian>                       (if (numberp level)
    Brian> -- 
    Brian> 2.34.1



Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[Brian Leung]

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

OK, I've updated the patch per your suggestions. I've also made 
the commit apply to the emacs-28 branch, as opposed to the master 
branch.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-flymake-Ensure-compatibility-with-older-Emacsen.patch --]
[-- Type: text/x-patch, Size: 1205 bytes --]

From afa46b0808384a90d760262bf8bf676a509aa194 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 7 Feb 2022 07:56:13 -0800
Subject: [PATCH] flymake: Ensure compatibility with older Emacsen

* lisp/progmodes/flymake.el (flymake--log-1): Use
replace-regexp-in-string instead of Emacs 28's
string-replace. (bug#53853)
---
 lisp/progmodes/flymake.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0c16ddedcb..e369cb1f21 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -267,8 +267,8 @@ If set to nil, don't suppress any zero counters."
          (format " [%s %s]"
                  (or sublog 'flymake)
                  ;; Handle file names with "%" correctly.  (Bug#51549)
-                 (string-replace "%" "%%"
-                                 (buffer-name (current-buffer))))))
+                 (replace-regexp-in-string "%" "%%"
+                                           (buffer-name (current-buffer))))))
     (display-warning (list 'flymake sublog)
                      (apply #'format-message msg args)
                      (if (numberp level)
-- 
2.34.1


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


Robert Pluim <rpluim@gmail.com> writes:

>>>>>> On Mon, 07 Feb 2022 16:11:28 +0000, Brian Leung 
>>>>>> <leungbk@posteo.net> said:
>
>     Brian> From e08cd430e2c0acbf063ad2d6a2d8d093745a5c7c Mon Sep 
>     17 00:00:00 2001
>     Brian> From: Brian Leung <leungbk@posteo.net>
>     Brian> Date: Mon, 7 Feb 2022 07:56:13 -0800
>     Brian> Subject: [PATCH] Don't use string-replace in flymake
>
>     Brian> * lisp/progmodes/flymake.el (flymake--log-1): Stay 
>     compatible with
>     Brian> older Emacsen.
>
> This bit is the 'why', and thus needs to be in the preamble. In 
> the
> ChangeLog entry you should explain what change youʼre making 
> "use
> replace-regexp-in-string instead..." .  And please put 
> (Bug#53853)
> somewhere in the commit message.
>
>     Brian> ---
>     Brian>  lisp/progmodes/flymake.el | 4 ++--
>     Brian>  1 file changed, 2 insertions(+), 2 deletions(-)
>
>     Brian> diff --git a/lisp/progmodes/flymake.el 
>     b/lisp/progmodes/flymake.el
>     Brian> index 0c16ddedcb..e369cb1f21 100644
>     Brian> --- a/lisp/progmodes/flymake.el
>     Brian> +++ b/lisp/progmodes/flymake.el
>     Brian> @@ -267,8 +267,8 @@ If set to nil, don't suppress any 
>     zero counters."
>     Brian>           (format " [%s %s]"
>     Brian>                   (or sublog 'flymake)
>     Brian>                   ;; Handle file names with "%" 
>     correctly.  (Bug#51549)
>     Brian> -                 (string-replace "%" "%%"
>     Brian> -                                 (buffer-name 
>     (current-buffer))))))
>     Brian> +                 (replace-regexp-in-string "%" "%%"
>     Brian> + 
>     (buffer-name (current-buffer))))))
>     Brian>      (display-warning (list 'flymake sublog)
>     Brian>                       (apply #'format-message msg 
>     args)
>     Brian>                       (if (numberp level)
>     Brian> -- 
>     Brian> 2.34.1
>
>
>
> Robert

bug#53853: [PATCH] Don't use string-replace in flymake

[Lars Ingebrigtsen]

Brian Leung <leungbk@posteo.net> writes:

> OK, I've updated the patch per your suggestions. I've also made the
> commit apply to the emacs-28 branch, as opposed to the master branch.

Thanks; pushed to emacs-28.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 08 Feb 2022 07:16:40 +0100, Lars Ingebrigtsen <larsi@gnus.org> said:

    Lars> Brian Leung <leungbk@posteo.net> writes:
    >> OK, I've updated the patch per your suggestions. I've also made the
    >> commit apply to the emacs-28 branch, as opposed to the master branch.

    Lars> Thanks; pushed to emacs-28.

Iʼm not au fait with how core packages work, does this require a bump
in flymake's package version?

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[Brian Leung]

I'm not sure how this kind of thing is usually handled, but for 
this specific fix, I think it's worth bumping the version since 
there are probably a decent chunk of people on Emacs <= 27 who 
will otherwise encounter an issue with Eglot (one guy reported 
this yesterday on the mailing list).

Robert Pluim <rpluim@gmail.com> writes:

>>>>>> On Tue, 08 Feb 2022 07:16:40 +0100, Lars Ingebrigtsen 
>>>>>> <larsi@gnus.org> said:
>
>     Lars> Brian Leung <leungbk@posteo.net> writes:
>     >> OK, I've updated the patch per your suggestions. I've 
>     >> also made the
>     >> commit apply to the emacs-28 branch, as opposed to the 
>     >> master branch.
>
>     Lars> Thanks; pushed to emacs-28.
>
> Iʼm not au fait with how core packages work, does this require a 
> bump
> in flymake's package version?
>
> Robert

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 08 Feb 2022 08:28:21 +0000, Brian Leung <leungbk@posteo.net> said:

    Brian> I'm not sure how this kind of thing is usually handled, but for this
    Brian> specific fix, I think it's worth bumping the version since there are
    Brian> probably a decent chunk of people on Emacs <= 27 who will otherwise
    Brian> encounter an issue with Eglot (one guy reported this yesterday on the
    Brian> mailing list).

If thatʼs the case we should change Package-Requires as well. And
someone™ should test with emacs-2{6,7}.

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

I'm not in front of my computer right now, but as far as I recall, there is
a note in the preamble of flymake.el asking maintainers not to use
functionality incompatible with the given emacs dependency.

The solution is either to abide or to create a new package that houses said
functionality and then make that a dependency.

João

On Tue, Feb 8, 2022, 08:35 Robert Pluim <rpluim@gmail.com> wrote:

> >>>>> On Tue, 08 Feb 2022 08:28:21 +0000, Brian Leung <leungbk@posteo.net>
> said:
>
>     Brian> I'm not sure how this kind of thing is usually handled, but for
> this
>     Brian> specific fix, I think it's worth bumping the version since
> there are
>     Brian> probably a decent chunk of people on Emacs <= 27 who will
> otherwise
>     Brian> encounter an issue with Eglot (one guy reported this yesterday
> on the
>     Brian> mailing list).
>
> If thatʼs the case we should change Package-Requires as well. And
> someone™ should test with emacs-2{6,7}.
>
> Robert
> --
>

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 8 Feb 2022 09:20:07 +0000, João Távora <joaotavora@gmail.com> said:

    João> I'm not in front of my computer right now, but as far as I recall, there is
    João> a note in the preamble of flymake.el asking maintainers not to use
    João> functionality incompatible with the given emacs dependency.

There is, and the current flymake.el says emacs-28.

    João> The solution is either to abide or to create a new package that houses said
    João> functionality and then make that a dependency.

If this is the only dependency on emacs-28 Iʼd hope we could just
decrease the Package-Requires to emacs-27 (or even emacs-26).

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

On Tue, Feb 8, 2022 at 9:26 AM Robert Pluim <rpluim@gmail.com> wrote:

> >>>>> On Tue, 08 Feb 2022 07:16:40 +0100, Lars Ingebrigtsen <
> larsi@gnus.org> said:
>
>     Lars> Brian Leung <leungbk@posteo.net> writes:
>     >> OK, I've updated the patch per your suggestions. I've also made the
>     >> commit apply to the emacs-28 branch, as opposed to the master
> branch.
>
>     Lars> Thanks; pushed to emacs-28.
>
> Iʼm not au fait with how core packages work, does this require a bump
> in flymake's package version?


Yes, Robert, I believe so. Else the core package won't get regenerated into
GNU ELPA.

What _doesn't_ require a bump is, for example, `eglot.el` usage of it.  So
if you
bump flymake.el to, say, 1.9 now and eglot.el is still asking for 1.8, I
think package.el
will pull in the latest one regardless and the problem for eglot.el users
will be fixed.

I suspect though, that this problem only happened because the user was using
the straight.el package manager, which will try to fetch the very latest
(i.e.
not go through GNU ELPA as package.el does).

Anyway, thanks for fixing this.
João

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

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

On Tue, Feb 8, 2022 at 9:50 AM Robert Pluim <rpluim@gmail.com> wrote:

> >>>>> On Tue, 8 Feb 2022 09:20:07 +0000, João Távora <joaotavora@gmail.com>
> said:
>
>     João> I'm not in front of my computer right now, but as far as I
> recall, there is
>     João> a note in the preamble of flymake.el asking maintainers not to
> use
>     João> functionality incompatible with the given emacs dependency.
>
> There is, and the current flymake.el says emacs-28.
>

Does it?  That's news to me.  It shouldn't, I think.  That breaks a lot of
downstream
users, eglot.el most notably.

I have to M-x vc-region-history that bit.

João

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

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

Eli, how are you?  I hope well.

This change:

commit 6b8957852476e4ba31873424aa8f81d9e55bc34c
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Dec 9 17:01:57 2021 +0200

    ; * lisp/progmodes/flymake.el: Update the minimum Emacs version.

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -9,1 +9,1 @@
-;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1"))
+;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1"))

breaks "downstream" users of flymake.el as a "core" package, eglot.el
most notably.

Can you explain it?  I'm not 100% sure if we have discussed this before.
If we have, I'm very sorry, but I forgot the context.

Thanks,
João

On Tue, Feb 8, 2022 at 9:54 AM João Távora <joaotavora@gmail.com> wrote:

> On Tue, Feb 8, 2022 at 9:50 AM Robert Pluim <rpluim@gmail.com> wrote:
>
>> >>>>> On Tue, 8 Feb 2022 09:20:07 +0000, João Távora <
>> joaotavora@gmail.com> said:
>>
>>     João> I'm not in front of my computer right now, but as far as I
>> recall, there is
>>     João> a note in the preamble of flymake.el asking maintainers not to
>> use
>>     João> functionality incompatible with the given emacs dependency.
>>
>> There is, and the current flymake.el says emacs-28.
>>
>
> Does it?  That's news to me.  It shouldn't, I think.  That breaks a lot of
> downstream
> users, eglot.el most notably.
>
> I have to M-x vc-region-history that bit.
>
> João
>
>
>

-- 
João Távora

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 8 Feb 2022 09:52:34 +0000, João Távora <joaotavora@gmail.com> said:

    João> On Tue, Feb 8, 2022 at 9:26 AM Robert Pluim <rpluim@gmail.com> wrote:
    >> >>>>> On Tue, 08 Feb 2022 07:16:40 +0100, Lars Ingebrigtsen <
    >> larsi@gnus.org> said:
    >> 
    Lars> Brian Leung <leungbk@posteo.net> writes:
    >> >> OK, I've updated the patch per your suggestions. I've also made the
    >> >> commit apply to the emacs-28 branch, as opposed to the master
    >> branch.
    >> 
    Lars> Thanks; pushed to emacs-28.
    >> 
    >> Iʼm not au fait with how core packages work, does this require a bump
    >> in flymake's package version?


    João> Yes, Robert, I believe so. Else the core package won't get regenerated into
    João> GNU ELPA.

OK

    João> What _doesn't_ require a bump is, for example, `eglot.el` usage of it.  So
    João> if you
    João> bump flymake.el to, say, 1.9 now and eglot.el is still asking for 1.8, I
    João> think package.el
    João> will pull in the latest one regardless and the problem for eglot.el users
    João> will be fixed.

    João> I suspect though, that this problem only happened because the user was using
    João> the straight.el package manager, which will try to fetch the very latest
    João> (i.e.
    João> not go through GNU ELPA as package.el does).

    João> Anyway, thanks for fixing this.

I donʼt think weʼre quite there yet. Let's see what Eli says in the
other thread.

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[Eli Zaretskii]

> From: João Távora <joaotavora@gmail.com>
> Date: Tue, 8 Feb 2022 09:58:06 +0000
> Cc: Brian Leung <leungbk@posteo.net>, Lars Ingebrigtsen <larsi@gnus.org>, 53853@debbugs.gnu.org
> 
> This change:
> 
> commit 6b8957852476e4ba31873424aa8f81d9e55bc34c
> Author: Eli Zaretskii <eliz@gnu.org>
> Date:   Thu Dec 9 17:01:57 2021 +0200
> 
>     ; * lisp/progmodes/flymake.el: Update the minimum Emacs version.
> 
> diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
> --- a/lisp/progmodes/flymake.el
> +++ b/lisp/progmodes/flymake.el
> @@ -9,1 +9,1 @@
> -;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1"))
> +;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1"))
> 
> breaks "downstream" users of flymake.el as a "core" package, eglot.el
> most notably.  
> 
> Can you explain it?  I'm not 100% sure if we have discussed this before.
> If we have, I'm very sorry, but I forgot the context.

Asked and answered, see

  https://lists.gnu.org/archive/html/emacs-devel/2021-12/msg01898.html
  https://lists.gnu.org/archive/html/help-gnu-emacs/2021-12/msg00166.html

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

Alright.  Seems that the discussion died down and there was never the fix
and
reversion we (presumably?) agreed on. So I think if the incompatible
string-something has
been now replaced by the replace-regexp-something that is compatible, we
should now
put the 26.1 in the header again.  If everyone agrees, I ask someone with a
Emacs
master/emacs-28 checkout nearby to do that change and also bump
flymake.el's version.

Robert maybe? Thanks in advance.

On Tue, Feb 8, 2022 at 1:04 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: João Távora <joaotavora@gmail.com>
> > Date: Tue, 8 Feb 2022 09:58:06 +0000
> > Cc: Brian Leung <leungbk@posteo.net>, Lars Ingebrigtsen <larsi@gnus.org>,
> 53853@debbugs.gnu.org
> >
> > This change:
> >
> > commit 6b8957852476e4ba31873424aa8f81d9e55bc34c
> > Author: Eli Zaretskii <eliz@gnu.org>
> > Date:   Thu Dec 9 17:01:57 2021 +0200
> >
> >     ; * lisp/progmodes/flymake.el: Update the minimum Emacs version.
> >
> > diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
> > --- a/lisp/progmodes/flymake.el
> > +++ b/lisp/progmodes/flymake.el
> > @@ -9,1 +9,1 @@
> > -;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1"))
> > +;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1"))
> >
> > breaks "downstream" users of flymake.el as a "core" package, eglot.el
> > most notably.
> >
> > Can you explain it?  I'm not 100% sure if we have discussed this before.
> > If we have, I'm very sorry, but I forgot the context.
>
> Asked and answered, see
>
>   https://lists.gnu.org/archive/html/emacs-devel/2021-12/msg01898.html
>   https://lists.gnu.org/archive/html/help-gnu-emacs/2021-12/msg00166.html
>


-- 
João Távora

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Eli Zaretskii]

> From: João Távora <joaotavora@gmail.com>
> Date: Tue, 8 Feb 2022 13:18:44 +0000
> Cc: Robert Pluim <rpluim@gmail.com>, Brian Leung <leungbk@posteo.net>, 
> 	Lars Ingebrigtsen <larsi@gnus.org>, 53853@debbugs.gnu.org
> 
> Alright.  Seems that the discussion died down and there was never the fix and 
> reversion we (presumably?) agreed on. So I think if the incompatible string-something has 
> been now replaced by the replace-regexp-something that is compatible, we should now 
> put the 26.1 in the header again.  If everyone agrees, I ask someone with a Emacs 
> master/emacs-28 checkout nearby to do that change and also bump flymake.el's version.

We didn't really agree on the revert: I asked to see the change as a
prerequisite for my agreement, and never saw any response.

I see that Lars already installed such a change on emacs-28, and it is
indeed quite simple.  So I'm okay with going with that.

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

Well, technically, I did "show the patch" even though I didn't author said
patch myself. I answered:

> It would seem that the right thing to do is to keep 26.1 dep and do what
Guillaume Pasquet suggests:
> "or substitute the `string-replace` call with `replace-regexp-in-string`
to maintain compatibility as I have done here:
>
https://github.com/Etenil/flymake/commit/9f5f76907b1c258645f65728dd71e7cacffe6d22

Anyway, all good now, just bring the Emacs dep down to 26.1.  Thanks.

João


On Tue, Feb 8, 2022 at 1:55 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: João Távora <joaotavora@gmail.com>
> > Date: Tue, 8 Feb 2022 13:18:44 +0000
> > Cc: Robert Pluim <rpluim@gmail.com>, Brian Leung <leungbk@posteo.net>,
> >       Lars Ingebrigtsen <larsi@gnus.org>, 53853@debbugs.gnu.org
> >
> > Alright.  Seems that the discussion died down and there was never the
> fix and
> > reversion we (presumably?) agreed on. So I think if the incompatible
> string-something has
> > been now replaced by the replace-regexp-something that is compatible, we
> should now
> > put the 26.1 in the header again.  If everyone agrees, I ask someone
> with a Emacs
> > master/emacs-28 checkout nearby to do that change and also bump
> flymake.el's version.
>
> We didn't really agree on the revert: I asked to see the change as a
> prerequisite for my agreement, and never saw any response.
>
> I see that Lars already installed such a change on emacs-28, and it is
> indeed quite simple.  So I'm okay with going with that.
>


-- 
João Távora

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

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

>>>>> On Tue, 8 Feb 2022 14:09:34 +0000, João Távora <joaotavora@gmail.com> said:

    João> Well, technically, I did "show the patch" even though I didn't author said
    João> patch myself. I answered:

    >> It would seem that the right thing to do is to keep 26.1 dep and do what
    João> Guillaume Pasquet suggests:
    >> "or substitute the `string-replace` call with `replace-regexp-in-string`
    João> to maintain compatibility as I have done here:
    >> 
    João> https://github.com/Etenil/flymake/commit/9f5f76907b1c258645f65728dd71e7cacffe6d22

    João> Anyway, all good now, just bring the Emacs dep down to 26.1.  Thanks.

Just so weʼre all clear, we want this in emacs-28 (on top of Lars's
change to use `replace-regexp-in-string'?


[-- Attachment #2: 0001-Mark-flymake-as-compatible-with-emacs-26.1.patch --]
[-- Type: text/x-diff, Size: 1111 bytes --]

From 31af9bca99fa88350271e1a905c9b435eaec28cf Mon Sep 17 00:00:00 2001
From: Robert Pluim <rpluim@gmail.com>
Date: Tue, 8 Feb 2022 16:04:15 +0100
Subject: [PATCH] Mark flymake as compatible with emacs-26.1
To: emacs-devel@gnu.org

* lisp/progmodes/flymake.el: Bump package version and set
emacs version in Package-Requires to 26.1 (Bug#53853).
---
 lisp/progmodes/flymake.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e369cb1f21..83d7bc8641 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -4,9 +4,9 @@
 
 ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: João Távora <joaotavora@gmail.com>
-;; Version: 1.2.1
+;; Version: 1.2.2
 ;; Keywords: c languages tools
-;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1"))
+;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1"))
 
 ;; This is a GNU ELPA :core package.  Avoid functionality that is not
 ;; compatible with the version of Emacs recorded above.
-- 
2.34.0


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


Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

On Tue, Feb 8, 2022 at 3:07 PM Robert Pluim <rpluim@gmail.com> wrote:

> >>>>> On Tue, 8 Feb 2022 14:09:34 +0000, João Távora <joaotavora@gmail.com>
> said:
>
>     João> Well, technically, I did "show the patch" even though I didn't
> author said
>     João> patch myself. I answered:
>
>     >> It would seem that the right thing to do is to keep 26.1 dep and do
> what
>     João> Guillaume Pasquet suggests:
>     >> "or substitute the `string-replace` call with
> `replace-regexp-in-string`
>     João> to maintain compatibility as I have done here:
>     >>
>     João>
> https://github.com/Etenil/flymake/commit/9f5f76907b1c258645f65728dd71e7cacffe6d22
>
>     João> Anyway, all good now, just bring the Emacs dep down to 26.1.
> Thanks.
>
> Just so weʼre all clear, we want this in emacs-28 (on top of Lars's
> change to use `replace-regexp-in-string'?
>

I think so. We're in that phase of the release cycle where everything in
emacs-28 that
fixes a bug ends up in main, right?  If so I would say yes. But let Eli or
Lars confirm.

João

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 8 Feb 2022 15:30:34 +0000, João Távora <joaotavora@gmail.com> said:

    >> Just so weʼre all clear, we want this in emacs-28 (on top of Lars's
    >> change to use `replace-regexp-in-string'?
    >> 

    João> I think so. We're in that phase of the release cycle where everything in
    João> emacs-28 that
    João> fixes a bug ends up in main, right?  If so I would say yes. But let Eli or
    João> Lars confirm.

Everything that gets committed to the release branch always gets
merged to master, unless itʼs marked 'do not merge'. The phase of the
release cycle weʼre in is: doc fixes and regressions only (unless we
manage to bribe Lars/Eli somehow :-) )

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

On Tue, Feb 8, 2022 at 3:47 PM Robert Pluim <rpluim@gmail.com> wrote:

>     João> I think so. We're in that phase of the release cycle where
> everything in
>     João> emacs-28 that
>     João> fixes a bug ends up in main, right?  If so I would say yes. But
> let Eli or
>     João> Lars confirm.
>
> Everything that gets committed to the release branch always gets
> merged to master, unless itʼs marked 'do not merge'.


Right that's what I meant by "ends up in main" ("main" the new name of the
former "master" branch, which is still accessible by that name AFAIK).


> The phase of the
> release cycle weʼre in is: doc fixes and regressions only (unless we
> manage to bribe Lars/Eli somehow :-) )


Right.  And isn't this a regression?  Something that used to work in Emacs
27.1
and doesn't in the upcoming Emacs 28.1?

Anyway, committing to master/main is probably fine too, because that's what
governs the "emission" of an ELPA package, as far as I know.

João

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 8 Feb 2022 15:51:59 +0000, João Távora <joaotavora@gmail.com> said:

    João> On Tue, Feb 8, 2022 at 3:47 PM Robert Pluim <rpluim@gmail.com> wrote:
    João> I think so. We're in that phase of the release cycle where
    >> everything in
    João> emacs-28 that
    João> fixes a bug ends up in main, right?  If so I would say yes. But
    >> let Eli or
    João> Lars confirm.
    >> 
    >> Everything that gets committed to the release branch always gets
    >> merged to master, unless itʼs marked 'do not merge'.


    João> Right that's what I meant by "ends up in main" ("main" the new name of the
    João> former "master" branch, which is still accessible by that name AFAIK).

In GNU Elpa maybe. In emacs the branch is called 'master'.

    >> The phase of the
    >> release cycle weʼre in is: doc fixes and regressions only (unless we
    >> manage to bribe Lars/Eli somehow :-) )


    João> Right.  And isn't this a regression?  Something that used to work in Emacs
    João> 27.1
    João> and doesn't in the upcoming Emacs 28.1?

    João> Anyway, committing to master/main is probably fine too, because that's what
    João> governs the "emission" of an ELPA package, as far as I know.

Yes, but the emacs-28 -> master merge happens pretty regularly as
well. Iʼm assuming thereʼs some magic that then makes GNU Elpa take notice.

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[João Távora]

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

On Tue, Feb 8, 2022 at 4:02 PM Robert Pluim <rpluim@gmail.com> wrote:

>
>     João> Right that's what I meant by "ends up in main" ("main" the new
> name of the
>     João> former "master" branch, which is still accessible by that name
> AFAIK).
>
> In GNU Elpa maybe. In emacs the branch is called 'master'.
>

I could have sworn I saw an email from Stefan Monnier explaining the
rename and that "master" is just an alias.  But I can't find it, and
git checkout main doesn't work, so yeah, masters of the universe.

João

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

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 8 Feb 2022 16:43:36 +0000, João Távora <joaotavora@gmail.com> said:

    João> On Tue, Feb 8, 2022 at 4:02 PM Robert Pluim <rpluim@gmail.com> wrote:
    >> 
    João> Right that's what I meant by "ends up in main" ("main" the new
    >> name of the
    João> former "master" branch, which is still accessible by that name
    >> AFAIK).
    >> 
    >> In GNU Elpa maybe. In emacs the branch is called 'master'.
    >> 

    João> I could have sworn I saw an email from Stefan Monnier explaining the
    João> rename and that "master" is just an alias.  But I can't find it, and
    João> git checkout main doesn't work, so yeah, masters of the universe.

In <jwvmtyapdzg.fsf-monnier+emacs@gnu.org> on Sat, 19 Dec 2020 Stefan
explained it, and it was just for elpa.git and nongnu.git.

Robert
-- 

bug#53853: [PATCH] Don't use string-replace in flymake

[Dmitry Gutov]

On 08.02.2022 17:30, João Távora wrote:
>     Just so weʼre all clear, we want this in emacs-28 (on top of Lars's
>     change to use `replace-regexp-in-string'?
> 
> 
> I think so. We're in that phase of the release cycle where everything in 
> emacs-28 that
> fixes a bug ends up in main, right?  If so I would say yes. But let Eli 
> or Lars confirm.

FWIW, neither of the changes were strictly necessary on the emacs-28 
branch: the ELPA core packages are generated from 'master'.

But they will probably reduce any possible confusion if a user decides 
to compare the branches.

bug#53853: [PATCH] Don't use string-replace in flymake

[Dmitry Gutov]

On 08.02.2022 18:43, João Távora wrote:
> I could have sworn I saw an email from Stefan Monnier explaining the
> rename and that "master" is just an alias.  But I can't find it, and
> git checkout main doesn't work, so yeah, masters of the universe.

ELPA uses 'main', Emacs still uses 'master'.

It was an executive decision.

bug#53853: [PATCH] Don't use string-replace in flymake

[Robert Pluim]

>>>>> On Tue, 8 Feb 2022 19:08:24 +0200, Dmitry Gutov <dgutov@yandex.ru> said:

    Dmitry> On 08.02.2022 17:30, João Távora wrote:
    >> Just so weʼre all clear, we want this in emacs-28 (on top of Lars's
    >> change to use `replace-regexp-in-string'?
    >> I think so. We're in that phase of the release cycle where
    >> everything in emacs-28 that
    >> fixes a bug ends up in main, right?  If so I would say yes. But let
    >> Eli or Lars confirm.

    Dmitry> FWIW, neither of the changes were strictly necessary on the emacs-28
    Dmitry> branch: the ELPA core packages are generated from 'master'.

    Dmitry> But they will probably reduce any possible confusion if a user decides
    Dmitry> to compare the branches.

Consistency is nice.

Pushed to emacs-28 as 31af9bca99

Robert
--