[pull request] Pull request for branch yem-kconfig-rc-fixes

[pull request] Pull request for branch yem-kconfig-rc-fixes

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Hello Michal, All,

Please pull these two rc-fixes:
  - fix key handling in empty menus in mconf
  - fix scripts/config wrt short --*-after options

Regards,
Yann E. MORIN


The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://gitorious.org/linux-kconfig/linux-kconfig.git yem-kconfig-rc-fixes

for you to fetch changes up to 8f9c6f75f603132869375a203d22e5b445f6294f:

  mconf: handle keys in empty dialogs (2013-05-20 14:15:27 +0200)

----------------------------------------------------------------
Clement Chauplannaz (1):
      scripts/config: fix assignment of parameters for short version of --*-after options

Dirk Gouders (1):
      mconf: handle keys in empty dialogs

 scripts/config                     |  2 +-
 scripts/kconfig/lxdialog/menubox.c |  8 ++++----
 scripts/kconfig/mconf.c            | 11 ++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[PATCH 1/2] scripts/config: fix assignment of parameters for short version of --*-after options

[Yann E. MORIN]

From: Clement Chauplannaz <chauplac@gmail.com>

When --*-after options are used, two parameters are parsed from the
command-line before the adequate function is called:
  - the `before' option, after which the new option will be inserted,
  - the name of the option to enable/disable/modularise.

With the short version of --*-after options (namely -E, -D, -M), the
parsing step is not performed which leads to processing unset variables.

Add options -E, -D, -M to the test that triggers assignment of parameters
for --*-after options.

Signed-off-by: Clement Chauplannaz <chauplac@gmail.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 scripts/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/config b/scripts/config
index bb4d3de..a65ecbb 100755
--- a/scripts/config
+++ b/scripts/config
@@ -105,7 +105,7 @@ while [ "$1" != "" ] ; do
 		;;
 	--refresh)
 		;;
-	--*-after)
+	--*-after|-E|-D|-M)
 		checkarg "$1"
 		A=$ARG
 		checkarg "$2"
-- 
1.8.1.2

[PATCH 2/2] mconf: handle keys in empty dialogs

[Yann E. MORIN]

From: Dirk Gouders <dirk@gouders.net>

When entering an empty dialog, using the movement keys resulted in
unexpected characters beeing displayed, other keys like "z" and "h"
did not work as expected.

This patch handles the movement keys as well as other keys, especially
"z", "h" and "/".

Signed-off-by: Dirk Gouders <dirk@gouders.net>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 scripts/kconfig/lxdialog/menubox.c |  8 ++++----
 scripts/kconfig/mconf.c            | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 48d382e..eda0350 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -303,10 +303,10 @@ do_resize:
 				}
 		}
 
-		if (i < max_choice ||
-		    key == KEY_UP || key == KEY_DOWN ||
-		    key == '-' || key == '+' ||
-		    key == KEY_PPAGE || key == KEY_NPAGE) {
+		if ((i < max_choice ||
+		     key == KEY_UP || key == KEY_DOWN ||
+		     key == '-' || key == '+' ||
+		     key == KEY_PPAGE || key == KEY_NPAGE) && item_count() != 0) {
 			/* Remove highligt of current item */
 			print_item(scroll + choice, choice, FALSE);
 
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 387dc8d..a69cbd7 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -670,11 +670,12 @@ static void conf(struct menu *menu, struct menu *active_menu)
 				  active_menu, &s_scroll);
 		if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
 			break;
-		if (!item_activate_selected())
-			continue;
-		if (!item_tag())
-			continue;
-
+		if (item_count() != 0) {
+			if (!item_activate_selected())
+				continue;
+			if (!item_tag())
+				continue;
+		}
 		submenu = item_data();
 		active_menu = item_data();
 		if (submenu)
-- 
1.8.1.2

Re: [pull request] Pull request for branch yem-kconfig-rc-fixes

[Yann E. MORIN]

Michal, All,

On 2013-05-20 17:48 +0200, Yann E. MORIN spake thusly:
> Please pull these two rc-fixes:
>   - fix key handling in empty menus in mconf
>   - fix scripts/config wrt short --*-after options

Please hold-on on this pull-request a bit more: there is another fix by
Dirk that I'll append to this list, and I will re-cubmit the pull-request
in a moment.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[pull request] Pull request for branch yem-kconfig-rc-fixes

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Hello Michal,

Please pull these post-rc1 kconfig cleanups, all after
review and comments by Jean:
  - simplify and cleanup the symbol-search code
  - better documentation about the symbols ordering in search results
  - eye-candy in the title of the search-box in [mn]conf

Regards,
Yann E. MORIN.


The following changes since commit b57caaaed2bd127fe656e6c145970ed6a05c0125:

  kconfig: allow "hex" and "range" to support longs (2013-06-29 15:30:17 +0200)

are available in the git repository at:

  git://gitorious.org/linux-kconfig/linux-kconfig.git yem-kconfig-rc-fixes

for you to fetch changes up to 508382a0428f2b2f49da0e0e89c921f07c9306aa:

  kconfig: simplify symbol-search code (2013-07-16 20:39:42 +0200)

----------------------------------------------------------------
Yann E. MORIN (6):
      Documentation/kconfig: more concise and straightforward search explanation
      kconfig: avoid multiple calls to strlen
      kconfig/[mn]conf: shorten title in search-box
      kconfig: minor style fixes in symbol-search code
      kconfig: don't allocate n+1 elements in temporary array
      kconfig: simplify symbol-search code

 Documentation/kbuild/kconfig.txt |  8 +++----
 scripts/kconfig/mconf.c          |  4 ++--
 scripts/kconfig/nconf.c          |  4 ++--
 scripts/kconfig/symbol.c         | 49 ++++++++++++++++------------------------
 4 files changed, 27 insertions(+), 38 deletions(-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Re: [pull request] Pull request for branch yem-kconfig-rc-fixes

[Jean Delvare]

Le Tuesday 16 July 2013 à 22:39 +0200, Yann E. MORIN a écrit :
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Hello Michal,
> 
> Please pull these post-rc1 kconfig cleanups, all after
> review and comments by Jean:
>   - simplify and cleanup the symbol-search code
>   - better documentation about the symbols ordering in search results
>   - eye-candy in the title of the search-box in [mn]conf
> 
> Regards,
> Yann E. MORIN.

It looks very good to me now, thanks Yann for the good work!

-- 
Jean Delvare
Suse L3

Re: [pull request] Pull request for branch yem-kconfig-rc-fixes

[Michal Marek]

On 17.7.2013 11:59, Jean Delvare wrote:
> Le Tuesday 16 July 2013 à 22:39 +0200, Yann E. MORIN a écrit :
>> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>
>> Hello Michal,
>>
>> Please pull these post-rc1 kconfig cleanups, all after
>> review and comments by Jean:
>>   - simplify and cleanup the symbol-search code
>>   - better documentation about the symbols ordering in search results
>>   - eye-candy in the title of the search-box in [mn]conf
>>
>> Regards,
>> Yann E. MORIN.
> 
> It looks very good to me now, thanks Yann for the good work!

It does look good indeed. But I am wondering if it's necessary for 3.11.
AFAICS the only user-visible changes are

  [PATCH 1/6] Documentation/kconfig: more concise and straightforward
search explanation
  [PATCH 3/6] kconfig/[mn]conf: shorten title in search-box

and the rest are code cleanups (however worthwhile), is that correct?
There is no change in the search behavior, is there? Then I would say
merge this for 3.12-rc1. Maybe merge the documentation patch for 3.11.

Thanks,
Michal

Re: [pull request] Pull request for branch yem-kconfig-rc-fixes

[Yann E. MORIN]

Michal, All,

On Tuesday 23 July 2013 15:37:37 Michal Marek wrote:
> On 17.7.2013 11:59, Jean Delvare wrote:
> > Le Tuesday 16 July 2013 à 22:39 +0200, Yann E. MORIN a écrit :
> >> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >>
> >> Hello Michal,
> >>
> >> Please pull these post-rc1 kconfig cleanups, all after
> >> review and comments by Jean:
> >>   - simplify and cleanup the symbol-search code
> >>   - better documentation about the symbols ordering in search results
> >>   - eye-candy in the title of the search-box in [mn]conf
> >>
> >> Regards,
> >> Yann E. MORIN.
> > 
> > It looks very good to me now, thanks Yann for the good work!
> 
> It does look good indeed. But I am wondering if it's necessary for 3.11.
> AFAICS the only user-visible changes are
> 
>   [PATCH 1/6] Documentation/kconfig: more concise and straightforward
> search explanation
>   [PATCH 3/6] kconfig/[mn]conf: shorten title in search-box
> 
> and the rest are code cleanups (however worthwhile), is that correct?
> There is no change in the search behavior, is there? Then I would say
> merge this for 3.12-rc1. Maybe merge the documentation patch for 3.11.

I think you can merge all for 3.12-rc1, in fact.
Even patches 1 and 3 are only eye-candy, and can well wait for 3.12.

Not sure why I wanted them in an -rc in the first place, so I'm fine
with all 6 patches going in for 3.12.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +0/33 662376056 | Software  Designer | \ / CAMPAIGN     |   ^                |
| --==< O_o >==-- '------------.-------:  X  AGAINST      |  /e\  There is no  |
| http://ymorin.is-a-geek.org/ | (*_*) | / \ HTML MAIL    |  """  conspiracy.  |
'------------------------------'-------'------------------'--------------------'

Re: [pull request] Pull request for branch yem-kconfig-rc-fixes

[Michal Marek]

Yann E. MORIN wrote:
> Michal, All,
> 
> On Tuesday 23 July 2013 15:37:37 Michal Marek wrote:
>> It does look good indeed. But I am wondering if it's necessary for 3.11.
>> AFAICS the only user-visible changes are
>>
>>   [PATCH 1/6] Documentation/kconfig: more concise and straightforward
>> search explanation
>>   [PATCH 3/6] kconfig/[mn]conf: shorten title in search-box
>>
>> and the rest are code cleanups (however worthwhile), is that correct?
>> There is no change in the search behavior, is there? Then I would say
>> merge this for 3.12-rc1. Maybe merge the documentation patch for 3.11.
> 
> I think you can merge all for 3.12-rc1, in fact.
> Even patches 1 and 3 are only eye-candy, and can well wait for 3.12.

OK, I merged it to kbuild.git#kconfig then. It will show up a bit later
on git.kernel.org, as I forgot my laptop with the ssh key at home :).

Michal