From 2bef18210a53ffbb0e618ba4b63f98d2477d8156 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Fri, 28 Sep 2001 19:53:11 +0000 Subject: [PATCH] Fixes to bracket_msg in global.c by DLR git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@798 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 ++- global.c | 8 ++++++-- nano.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c1ce225..3ad8e038 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,7 +22,8 @@ CVS code - - Bracket (brace, parens, etc) matching code by Ken Tyler. New functions do_find_bracket(), changes to findnextstr(), command is Meta-] (hope you dont mind since I already sold off - Meta-O to the MacOS file code Ken...) + Meta-O to the MacOS file code Ken...) Fixes to bracket_msg + by DLR. - files.c: do_writeout() - Expanded strings to not use %s and ?: to determine diff --git a/global.c b/global.c index 2e26a03a..cf581c02 100644 --- a/global.c +++ b/global.c @@ -248,8 +248,10 @@ void shortcut_init(int unjustify) #ifndef NANO_SMALL char *nano_tofiles_msg = "", *nano_gotodir_msg = "", *nano_case_msg = - "", *nano_reverse_msg = "", *nano_regexp_msg = "", - *nano_bracket_msg = ""; + "", *nano_reverse_msg = ""; +#ifdef HAVE_REGEX_H + char *nano_regexp_msg = "", *nano_bracket_msg = ""; +#endif nano_help_msg = _("Invoke the help menu"); nano_writeout_msg = _("Write the current file to disk"); @@ -294,8 +296,10 @@ void shortcut_init(int unjustify) nano_cancel_msg = _("Cancel the current function"); nano_append_msg = _("Append to the current file"); nano_reverse_msg = _("Search backwards"); +#ifdef HAVE_REGEX_H nano_regexp_msg = _("Use Regular expressions"); nano_bracket_msg = _("Find other bracket"); +#endif #endif sc_init_one(&main_list[0], NANO_HELP_KEY, _("Get Help"), diff --git a/nano.h b/nano.h index 1fbaa956..9f97d2b1 100644 --- a/nano.h +++ b/nano.h @@ -318,7 +318,7 @@ know what you're doing */ #define WRITEFILE_LIST_LEN (3 - NO_BROWSER) #define INSERTFILE_LIST_LEN (2 - NO_BROWSER) #define BROWSER_LIST_LEN 4 -#define MAIN_LIST_LEN 27 +#define MAIN_LIST_LEN (27 - NO_REGEX) #define MAIN_VISIBLE 12 #define REPLACE_LIST_2_LEN 3 #define GOTO_LIST_LEN 3 -- 2.39.5