From 2f702285eb525db5ae0c3d75e8cbf926de4fbbc1 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 25 Jul 2006 22:24:48 +0000 Subject: [PATCH] in toggle_init(), make sure that a blank line is not displayed after the Meta-Q toggle when mouse support is disabled and we're in restricted mode, and that it is displayed all other times git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3817 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 8 +++++++- src/global.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed9a6be3..e368b37b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,7 +111,13 @@ CVS code - shortcut_init(), sc_init_one() - Don't include blank_after when DISABLE_HELP is defined, as it's never used then. (DLR) - toggle_init(), toggle_init_one() + toggle_init() + - Don't include desc or blank_after when DISABLE_HELP is + defined, as neither are ever used then. (DLR) + - Make sure that a blank line is not displayed after the Meta-Q + toggle when mouse support is disabled and we're in restricted + mode, and that it is displayed all other times. (DLR) + toggle_init_one() - Don't include desc or blank_after when DISABLE_HELP is defined, as neither are ever used then. (DLR) - help.c: diff --git a/src/global.c b/src/global.c index 1a62244b..8c686781 100644 --- a/src/global.c +++ b/src/global.c @@ -1338,12 +1338,12 @@ void toggle_init(void) #endif toggle_init_one(TOGGLE_TABSTOSPACES_KEY, -#if defined(ENABLE_MULTIBUFFER) || !defined(DISABLE_MOUSE) +#ifndef DISABLE_MOUSE + IFTHELP(N_("Conversion of typed tabs to spaces"), TRUE, + TABS_TO_SPACES) +#else IFTHELP(N_("Conversion of typed tabs to spaces"), !ISSET(RESTRICTED) ? TRUE : FALSE, TABS_TO_SPACES) -#else - IFTHELP(N_("Conversion of typed tabs to spaces"), FALSE, - TABS_TO_SPACES) #endif );