ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix more bad #ifdefs 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2585 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-06-03 19:11:27 +00:00
parent 5854a87070
commit 8e15674c70
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/global.c
View File

@ -167,7 +167,7 @@ const shortcut *currshortcut; /* Current shortcut list we're using */
toggle *toggles = NULL; toggle *toggles = NULL;
#endif #endif
#ifndef NANO_SMALL #if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
filestruct *search_history = NULL; filestruct *search_history = NULL;
filestruct *searchage = NULL; filestruct *searchage = NULL;
filestruct *searchbot = NULL; filestruct *searchbot = NULL;
@ -177,7 +177,6 @@ filestruct *replacebot = NULL;
#endif #endif
/* Regular expressions */ /* Regular expressions */
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
regex_t search_regexp; /* Global to store compiled search regexp */ regex_t search_regexp; /* Global to store compiled search regexp */
regmatch_t regmatches[10]; /* Match positions for parenthetical regmatch_t regmatches[10]; /* Match positions for parenthetical
@ -257,7 +256,9 @@ void shortcut_init(bool unjustify)
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
const char *regexp_msg = N_("Regexp"); const char *regexp_msg = N_("Regexp");
#endif #endif
#ifdef ENABLE_NANORC
const char *history_msg = N_("History"); const char *history_msg = N_("History");
#endif
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
const char *new_buffer_msg = N_("New Buffer"); const char *new_buffer_msg = N_("New Buffer");
#endif #endif
@ -345,9 +346,11 @@ void shortcut_init(bool unjustify)
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
const char *nano_regexp_msg = N_("Use regular expressions"); const char *nano_regexp_msg = N_("Use regular expressions");
#endif #endif
#ifdef ENABLE_NANORC
const char *nano_history_msg = const char *nano_history_msg =
N_("Edit the previous search/replace strings"); N_("Edit the previous search/replace strings");
#endif #endif
#endif /* !NANO_SMALL */
#ifndef DISABLE_BROWSER #ifndef DISABLE_BROWSER
const char *nano_tofiles_msg = N_("Go to file 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); NANO_NO_KEY, VIEW, NULL);
#endif #endif
#ifdef ENABLE_NANORC
/* Translators: try to keep this string under 10 characters long */ /* Translators: try to keep this string under 10 characters long */
sc_init_one(&whereis_list, NANO_PREVLINE_KEY, history_msg, sc_init_one(&whereis_list, NANO_PREVLINE_KEY, history_msg,
IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, NULL); NANO_NO_KEY, VIEW, NULL);
#endif
/* Translators: try to keep this string under 10 characters long */ /* Translators: try to keep this string under 10 characters long */
sc_init_one(&whereis_list, NANO_CUTTILLEND_KEY, cut_till_end_msg, 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); NANO_NO_KEY, VIEW, NULL);
#endif #endif
#ifndef ENABLE_NANORC
sc_init_one(&replace_list, NANO_PREVLINE_KEY, history_msg, sc_init_one(&replace_list, NANO_PREVLINE_KEY, history_msg,
IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, NULL); NANO_NO_KEY, VIEW, NULL);
#endif
#endif /* !NANO_SMALL */ #endif /* !NANO_SMALL */
free_shortcutage(&replace_list_2); free_shortcutage(&replace_list_2);
@ -764,7 +771,7 @@ void shortcut_init(bool unjustify)
IFHELP(nano_lastline_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_lastline_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, do_last_line); 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, sc_init_one(&replace_list_2, NANO_PREVLINE_KEY, history_msg,
IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_history_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, NULL); NANO_NO_KEY, VIEW, NULL);