bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors]

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

My /etc/fstab file contains a line for the file system cgroup2 (i.e. for
cgroup v2 instead of cgroup for cgroup v1).  I just learned about
etc-fstab-generic-mode and after loading generic-x and visiting
/etc/fstab, I saw that in the line for cgroup2, the entry in the type
column is fontified in the default face, not in font-lock-keyword-face,
unlike all other file system types in my /etc/fstab file.  This patch
fixes the misfontification:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: etc-fstab-generic-mode patch --]
[-- Type: text/x-patch, Size: 276 bytes --]

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index b4ae0225943..373bfad92dd 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1491,6 +1491,7 @@ etc-fstab-generic-mode
     "cd9660"
     "cfs"
     "cgroup"
+    "cgroup2"
     "cifs"
     "coda"
     "coherent"

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


While the misfontification isn't a regression -- the support for cgroups
(but only for cgroup v1) in etc-fstab-generic-mode was added in January
2021 (commit 80d964ec8b) -- the fix could go into emacs-29, since cgroup
v2 became official in the Linux kernel in March 2016 (kernel 4.5); i.e.,
omitting cgroup2 was presumably an oversight in that commit.


In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
 3.24.38, cairo version 1.18.0) of 2024-01-09 built on strobelfs2
Repository revision: fccaeabc959f5403ce49744030bd2620352b59f8
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12101009
System Description: Linux From Scratch r12.0-112

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Stefan Kangas]

Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of
text editors" <bug-gnu-emacs@gnu.org> writes:

> My /etc/fstab file contains a line for the file system cgroup2 (i.e. for
> cgroup v2 instead of cgroup for cgroup v1).  I just learned about
> etc-fstab-generic-mode and after loading generic-x and visiting
> /etc/fstab, I saw that in the line for cgroup2, the entry in the type
> column is fontified in the default face, not in font-lock-keyword-face,
> unlike all other file system types in my /etc/fstab file.  This patch
> fixes the misfontification:
>
> diff --git a/lisp/generic-x.el b/lisp/generic-x.el
> index b4ae0225943..373bfad92dd 100644
> --- a/lisp/generic-x.el
> +++ b/lisp/generic-x.el
> @@ -1491,6 +1491,7 @@ etc-fstab-generic-mode
>      "cd9660"
>      "cfs"
>      "cgroup"
> +    "cgroup2"
>      "cifs"
>      "coda"
>      "coherent"

Thanks, but could you please reformat this using `git format-patch -1`?

> While the misfontification isn't a regression -- the support for cgroups
> (but only for cgroup v1) in etc-fstab-generic-mode was added in January
> 2021 (commit 80d964ec8b) -- the fix could go into emacs-29, since cgroup
> v2 became official in the Linux kernel in March 2016 (kernel 4.5); i.e.,
> omitting cgroup2 was presumably an oversight in that commit.

I don't really have an opinion, but sounds good to me.  Eli?

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Wed, 10 Jan 2024 06:55:30 -0800
> Cc: Eli Zaretskii <eliz@gnu.org>
> 
> Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of
> text editors" <bug-gnu-emacs@gnu.org> writes:
> 
> > While the misfontification isn't a regression -- the support for cgroups
> > (but only for cgroup v1) in etc-fstab-generic-mode was added in January
> > 2021 (commit 80d964ec8b) -- the fix could go into emacs-29, since cgroup
> > v2 became official in the Linux kernel in March 2016 (kernel 4.5); i.e.,
> > omitting cgroup2 was presumably an oversight in that commit.
> 
> I don't really have an opinion, but sounds good to me.  Eli?

I don't mind adding this to emacs-29.

Thanks.

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On Wed, 10 Jan 2024 06:55:30 -0800 Stefan Kangas <stefankangas@gmail.com> wrote:

> Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of
> text editors" <bug-gnu-emacs@gnu.org> writes:
>
>> My /etc/fstab file contains a line for the file system cgroup2 (i.e. for
>> cgroup v2 instead of cgroup for cgroup v1).  I just learned about
>> etc-fstab-generic-mode and after loading generic-x and visiting
>> /etc/fstab, I saw that in the line for cgroup2, the entry in the type
>> column is fontified in the default face, not in font-lock-keyword-face,
>> unlike all other file system types in my /etc/fstab file.  This patch
>> fixes the misfontification:
>>
>> diff --git a/lisp/generic-x.el b/lisp/generic-x.el
>> index b4ae0225943..373bfad92dd 100644
>> --- a/lisp/generic-x.el
>> +++ b/lisp/generic-x.el
>> @@ -1491,6 +1491,7 @@ etc-fstab-generic-mode
>>      "cd9660"
>>      "cfs"
>>      "cgroup"
>> +    "cgroup2"
>>      "cifs"
>>      "coda"
>>      "coherent"
>
> Thanks, but could you please reformat this using `git format-patch -1`?

On Wed, 10 Jan 2024 17:07:26 +0200 Eli Zaretskii <eliz@gnu.org> wrote:

>> From: Stefan Kangas <stefankangas@gmail.com>
>> Date: Wed, 10 Jan 2024 06:55:30 -0800
>> Cc: Eli Zaretskii <eliz@gnu.org>
>>
>> Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of
>> text editors" <bug-gnu-emacs@gnu.org> writes:
>>
>> > While the misfontification isn't a regression -- the support for cgroups
>> > (but only for cgroup v1) in etc-fstab-generic-mode was added in January
>> > 2021 (commit 80d964ec8b) -- the fix could go into emacs-29, since cgroup
>> > v2 became official in the Linux kernel in March 2016 (kernel 4.5); i.e.,
>> > omitting cgroup2 was presumably an oversight in that commit.
>>
>> I don't really have an opinion, but sounds good to me.  Eli?
>
> I don't mind adding this to emacs-29.
>
> Thanks.

Instead of resending the patch I just went ahead and installed it to
emacs-29.

Steve Berman

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Stefan Kangas]

Stefan Kangas <stefankangas@gmail.com> writes:

> Thanks, but could you please reformat this using `git format-patch -1`?

Ah, I forgot you have commit access.  My bad.

So please just install this on emacs-29.  Thanks in advance.

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On Wed, 10 Jan 2024 16:26:21 +0100 Stephen Berman <stephen.berman@gmx.net> wrote:

> On Wed, 10 Jan 2024 06:55:30 -0800 Stefan Kangas <stefankangas@gmail.com> wrote:
>
>> Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of
>> text editors" <bug-gnu-emacs@gnu.org> writes:
>>
>>> My /etc/fstab file contains a line for the file system cgroup2 (i.e. for
>>> cgroup v2 instead of cgroup for cgroup v1).  I just learned about
>>> etc-fstab-generic-mode and after loading generic-x and visiting
>>> /etc/fstab, I saw that in the line for cgroup2, the entry in the type
>>> column is fontified in the default face, not in font-lock-keyword-face,
>>> unlike all other file system types in my /etc/fstab file.  This patch
>>> fixes the misfontification:
>>>
>>> diff --git a/lisp/generic-x.el b/lisp/generic-x.el
>>> index b4ae0225943..373bfad92dd 100644
>>> --- a/lisp/generic-x.el
>>> +++ b/lisp/generic-x.el
>>> @@ -1491,6 +1491,7 @@ etc-fstab-generic-mode
>>>      "cd9660"
>>>      "cfs"
>>>      "cgroup"
>>> +    "cgroup2"
>>>      "cifs"
>>>      "coda"
>>>      "coherent"
>>
>> Thanks, but could you please reformat this using `git format-patch -1`?
>
> On Wed, 10 Jan 2024 17:07:26 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
>
>>> From: Stefan Kangas <stefankangas@gmail.com>
>>> Date: Wed, 10 Jan 2024 06:55:30 -0800
>>> Cc: Eli Zaretskii <eliz@gnu.org>
>>>
>>> Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of
>>> text editors" <bug-gnu-emacs@gnu.org> writes:
>>>
>>> > While the misfontification isn't a regression -- the support for cgroups
>>> > (but only for cgroup v1) in etc-fstab-generic-mode was added in January
>>> > 2021 (commit 80d964ec8b) -- the fix could go into emacs-29, since cgroup
>>> > v2 became official in the Linux kernel in March 2016 (kernel 4.5); i.e.,
>>> > omitting cgroup2 was presumably an oversight in that commit.
>>>
>>> I don't really have an opinion, but sounds good to me.  Eli?
>>
>> I don't mind adding this to emacs-29.
>>
>> Thanks.
>
> Instead of resending the patch I just went ahead and installed it to
> emacs-29.

And now closed the bug.

Steve Berman

bug#68367: 30.0.50; etc-fstab-generic-mode is missing cgroup2

[Stefan Kangas]

Stephen Berman <stephen.berman@gmx.net> writes:

> Instead of resending the patch I just went ahead and installed it to
> emacs-29.

Thanks!