diff mbox

[13/15] kconfig/[mn]conf: make it explicit in the search box that a regexp is possible

Message ID a1ce636f560336ba007bfabb15b167ff31b592cf.1372097219.git.yann.morin.1998@free.fr (mailing list archive)
State New, archived
Headers show

Commit Message

Yann E. MORIN June 24, 2013, 6:11 p.m. UTC 
From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Reported-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jean Delvare <jdelvare@suse.de>
Cc: Michal Marek <mmarek@suse.cz>
---
 scripts/kconfig/mconf.c | 2 +-
 scripts/kconfig/nconf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jean Delvare July 8, 2013, 11:25 a.m. UTC | #1 
Hi Yann,

Le Monday 24 June 2013 à 20:11 +0200, Yann E. MORIN a écrit :
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Reported-by: Jean Delvare <jdelvare@suse.de>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Jean Delvare <jdelvare@suse.de>
> Cc: Michal Marek <mmarek@suse.cz>
> ---
>  scripts/kconfig/mconf.c | 2 +-
>  scripts/kconfig/nconf.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
> index 6ee4aae..18d3dc9 100644
> --- a/scripts/kconfig/mconf.c
> +++ b/scripts/kconfig/mconf.c
> @@ -401,7 +401,7 @@ static void search_conf(void)
>  	struct subtitle_part stpart;
>  
>  	title = str_new();
> -	str_printf( &title, _("Enter %s (sub)string to search for "
> +	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
>  			      "(with or without \"%s\")"), CONFIG_, CONFIG_);

While clearer, this also makes the title span over two lines when it
used to fit on a single one. I would like to suggest the following:

	str_printf(&title, _("Enter (sub)string or regexp to search for "
			     "(with or without \"%s\")"), CONFIG_);

Rationale: the "(with or without CONFIG_)" makes things clear enough
IMHO, making the first occurrence redundant.

But if you don't like this proposal then let's just go with yours, it's
up to you.

>  
>  again:
> diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
> index 0183153..7975d8d 100644
> --- a/scripts/kconfig/nconf.c
> +++ b/scripts/kconfig/nconf.c
> @@ -695,7 +695,7 @@ static void search_conf(void)
>  	int dres;
>  
>  	title = str_new();
> -	str_printf( &title, _("Enter %s (sub)string to search for "
> +	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
>  			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
>  
>  again:
Yann E. MORIN July 8, 2013, 5:37 p.m. UTC | #2 
Jean, All,

On 2013-07-08 13:25 +0200, Jean Delvare spake thusly:
> Le Monday 24 June 2013 à 20:11 +0200, Yann E. MORIN a écrit :
> > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > 
> > Reported-by: Jean Delvare <jdelvare@suse.de>
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Jean Delvare <jdelvare@suse.de>
> > Cc: Michal Marek <mmarek@suse.cz>
> > ---
> >  scripts/kconfig/mconf.c | 2 +-
> >  scripts/kconfig/nconf.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
> > index 6ee4aae..18d3dc9 100644
> > --- a/scripts/kconfig/mconf.c
> > +++ b/scripts/kconfig/mconf.c
> > @@ -401,7 +401,7 @@ static void search_conf(void)
> >  	struct subtitle_part stpart;
> >  
> >  	title = str_new();
> > -	str_printf( &title, _("Enter %s (sub)string to search for "
> > +	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
> >  			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
> 
> While clearer, this also makes the title span over two lines when it
> used to fit on a single one. I would like to suggest the following:
> 
> 	str_printf(&title, _("Enter (sub)string or regexp to search for "
> 			     "(with or without \"%s\")"), CONFIG_);
> 
> Rationale: the "(with or without CONFIG_)" makes things clear enough
> IMHO, making the first occurrence redundant.

OK, I'll send another patch with the text updated with your suggestion.

Thank you! :-)

Regards,
Yann E. MORIN.
Jean Delvare July 16, 2013, 2:31 p.m. UTC | #3 
Hi Yann,

Le Monday 08 July 2013 à 19:37 +0200, Yann E. MORIN a écrit :
> Jean, All,
> 
> On 2013-07-08 13:25 +0200, Jean Delvare spake thusly:
> > Le Monday 24 June 2013 à 20:11 +0200, Yann E. MORIN a écrit :
> > > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > > 
> > > Reported-by: Jean Delvare <jdelvare@suse.de>
> > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > > Cc: Jean Delvare <jdelvare@suse.de>
> > > Cc: Michal Marek <mmarek@suse.cz>
> > > ---
> > >  scripts/kconfig/mconf.c | 2 +-
> > >  scripts/kconfig/nconf.c | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
> > > index 6ee4aae..18d3dc9 100644
> > > --- a/scripts/kconfig/mconf.c
> > > +++ b/scripts/kconfig/mconf.c
> > > @@ -401,7 +401,7 @@ static void search_conf(void)
> > >  	struct subtitle_part stpart;
> > >  
> > >  	title = str_new();
> > > -	str_printf( &title, _("Enter %s (sub)string to search for "
> > > +	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
> > >  			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
> > 
> > While clearer, this also makes the title span over two lines when it
> > used to fit on a single one. I would like to suggest the following:
> > 
> > 	str_printf(&title, _("Enter (sub)string or regexp to search for "
> > 			     "(with or without \"%s\")"), CONFIG_);
> > 
> > Rationale: the "(with or without CONFIG_)" makes things clear enough
> > IMHO, making the first occurrence redundant.
> 
> OK, I'll send another patch with the text updated with your suggestion.

Did you? I can't remember seeing it.
Yann E. MORIN July 16, 2013, 2:39 p.m. UTC | #4 
Jean, All,

On Tuesday 16 July 2013 16:31:20 Jean Delvare wrote:
> Le Monday 08 July 2013 à 19:37 +0200, Yann E. MORIN a écrit :
> > On 2013-07-08 13:25 +0200, Jean Delvare spake thusly:
> > > Le Monday 24 June 2013 à 20:11 +0200, Yann E. MORIN a écrit :
[--SNIP--]
> > > > -	str_printf( &title, _("Enter %s (sub)string to search for "
> > > > +	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
> > > >  			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
> > > 
> > > While clearer, this also makes the title span over two lines when it
> > > used to fit on a single one. I would like to suggest the following:
> > > 
> > > 	str_printf(&title, _("Enter (sub)string or regexp to search for "
> > > 			     "(with or without \"%s\")"), CONFIG_);
> > > 
> > > Rationale: the "(with or without CONFIG_)" makes things clear enough
> > > IMHO, making the first occurrence redundant.
> > 
> > OK, I'll send another patch with the text updated with your suggestion.
> 
> Did you? I can't remember seeing it.

Doh! I forgot that one... Will do.

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 6ee4aae..18d3dc9 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -401,7 +401,7 @@  static void search_conf(void)
 	struct subtitle_part stpart;
 
 	title = str_new();
-	str_printf( &title, _("Enter %s (sub)string to search for "
+	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
 			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
 
 again:
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 0183153..7975d8d 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -695,7 +695,7 @@  static void search_conf(void)
 	int dres;
 
 	title = str_new();
-	str_printf( &title, _("Enter %s (sub)string to search for "
+	str_printf( &title, _("Enter %s (sub)string or regexp to search for "
 			      "(with or without \"%s\")"), CONFIG_, CONFIG_);
 
 again: