From 8e15674c706b257c2d1f954f72a3d2865078d798 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Fri, 3 Jun 2005 19:11:27 +0000 Subject: [PATCH] fix more bad #ifdefs git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2585 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- src/global.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/global.c b/src/global.c index 0ce8b662..61e8a00b 100644 --- a/src/global.c +++ b/src/global.c @@ -167,7 +167,7 @@ const shortcut *currshortcut; /* Current shortcut list we're using */ toggle *toggles = NULL; #endif -#ifndef NANO_SMALL +#if !defined(NANO_SMALL) && defined(ENABLE_NANORC) filestruct *search_history = NULL; filestruct *searchage = NULL; filestruct *searchbot = NULL; @@ -177,7 +177,6 @@ filestruct *replacebot = NULL; #endif /* Regular expressions */ - #ifdef HAVE_REGEX_H regex_t search_regexp; /* Global to store compiled search regexp */ regmatch_t regmatches[10]; /* Match positions for parenthetical @@ -257,7 +256,9 @@ void shortcut_init(bool unjustify) #ifdef HAVE_REGEX_H const char *regexp_msg = N_("Regexp"); #endif +#ifdef ENABLE_NANORC const char *history_msg = N_("History"); +#endif #ifdef ENABLE_MULTIBUFFER const char *new_buffer_msg = N_("New Buffer"); #endif @@ -345,9 +346,11 @@ void shortcut_init(bool unjustify) #ifdef HAVE_REGEX_H const char *nano_regexp_msg = N_("Use regular expressions"); #endif +#ifdef ENABLE_NANORC const char *nano_history_msg = N_("Edit the previous search/replace strings"); #endif +#endif /* !NANO_SMALL */ #ifndef DISABLE_BROWSER const char *nano_tofiles_msg = N_("Go to file browser"); @@ -669,10 +672,12 @@ void shortcut_init(bool unjustify) NANO_NO_KEY, VIEW, NULL); #endif +#ifdef ENABLE_NANORC /* Translators: try to keep this string under 10 characters long */ sc_init_one(&whereis_list, NANO_PREVLINE_KEY, history_msg, IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY, NANO_NO_KEY, VIEW, NULL); +#endif /* Translators: try to keep this string under 10 characters long */ sc_init_one(&whereis_list, NANO_CUTTILLEND_KEY, cut_till_end_msg, @@ -735,9 +740,11 @@ void shortcut_init(bool unjustify) NANO_NO_KEY, VIEW, NULL); #endif +#ifndef ENABLE_NANORC sc_init_one(&replace_list, NANO_PREVLINE_KEY, history_msg, IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY, NANO_NO_KEY, VIEW, NULL); +#endif #endif /* !NANO_SMALL */ free_shortcutage(&replace_list_2); @@ -764,7 +771,7 @@ void shortcut_init(bool unjustify) IFHELP(nano_lastline_msg, NANO_NO_KEY), NANO_NO_KEY, NANO_NO_KEY, VIEW, do_last_line); -#ifndef NANO_SMALL +#if !defined(NANO_SMALL) && defined(ENABLE_NANORC) sc_init_one(&replace_list_2, NANO_PREVLINE_KEY, history_msg, IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY, NANO_NO_KEY, VIEW, NULL); -- 2.39.5