public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Michal Marek <mmarek@suse.cz>
Cc: Cong Wang <amwang@redhat.com>,
	Arnaud Lacombe <lacombar@gmail.com>,
	Davidlohr Bueso <dave@gnu.org>,
	LKML <linux-kernel@vger.kernel.org>,
	linux-kbuild@vger.kernel.org, Wang YanQing <udknight@gmail.com>
Subject: [PATCH] menuconfig: fix a regression when canceling the prompt dialog at exit
Date: Mon, 16 Jan 2012 15:57:39 +0800	[thread overview]
Message-ID: <4F13D873.4070808@cn.fujitsu.com> (raw)
In-Reply-To: <4F13D216.3060705@cn.fujitsu.com>

This commit fixes a bug, while introducing a new one..

commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2
Author: Wang YanQing <udknight@gmail.com>
Date:   Thu Jan 12 11:31:32 2012 +0800

    menuconfig: let make not report error when not save configuration

Pressing ESC should cancel the yes/no dialog and return back to
the main menu, but not exit from menuconfig.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 scripts/kconfig/mconf.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 86cd1ea..2c6286c 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -830,7 +830,8 @@ static int handle_exit(void)
 		fprintf(stderr, _("\n\n"
 				  "Your configuration changes were NOT saved."
 				  "\n\n"));
-		res = 0;
+		if (res != KEY_ESC)
+			res = 0;
 	}
 
 	return res;
-- 
1.7.3.1

  reply	other threads:[~2012-01-16  7:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-16  7:01 [PATCH] kconfig: fix a regression when exiting menuconfig without saving Li Zefan
2012-01-16  7:20 ` Cong Wang
2012-01-16  7:30   ` Li Zefan
2012-01-16  7:57     ` Li Zefan [this message]
2012-01-16  8:05       ` [PATCH] menuconfig: fix a regression when canceling the prompt dialog at exit Wang YanQing
2012-01-16 13:44       ` Michal Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F13D873.4070808@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=amwang@redhat.com \
    --cc=dave@gnu.org \
    --cc=lacombar@gmail.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    --cc=udknight@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox