disable "Where Is Next" in tiny mode

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1727 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index ba9ce9d71e172f2d7b6f34d3806b47d880c5eab1..5c323c8952d9863a1df041c850471e5caa51440c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ CVS code -
          instead of inside the disabled functions. (David Benbennick)
        - Clarifications to comments explaining exactly what control
          characters and escape sequences are supported. (DLR)
+       - Disable "Where Is Next" in tiny mode. (DLR)
 - files.c:
   add_open_file()
        - Rearrange the NANO_SMALL #ifdef so that the code to set the

diff --git a/src/global.c b/src/global.c
index 636f96e7768ed0d226f375567a159f5271355515..3b1a0fa2bec4d96cfd6f7baeaf7f13b7fd6c8372 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -622,7 +622,8 @@ void shortcut_init(int unjustify)
                NANO_OPENNEXT_ALTKEY, VIEW, open_nextfile_void);
 #endif
 
-#if !defined(NANO_SMALL) && defined(HAVE_REGEX_H)
+#ifndef NANO_SMALL
+#ifdef HAVE_REGEX_H
     sc_init_one(&main_list, NANO_NO_KEY, _("Find Other Bracket"),
                IFHELP(nano_bracket_msg, NANO_BRACKET_KEY), NANO_NO_KEY,
                NANO_NO_KEY, VIEW, do_find_bracket);
@@ -631,6 +632,7 @@ void shortcut_init(int unjustify)
     sc_init_one(&main_list, NANO_NO_KEY, _("Where Is Next"),
                IFHELP(nano_whereis_next_msg, NANO_WHEREIS_NEXT_KEY),
                NANO_NO_KEY, NANO_NO_KEY, VIEW, do_research);
+#endif
 
     free_shortcutage(&whereis_list);
 

diff --git a/src/proto.h b/src/proto.h
index 26349d58462053c7ad6bd3ab222636bdd266e753..5effeef637872604b80a82aa078242f6955d9eab 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -372,7 +372,9 @@ int is_whole_word(int curr_pos, const char *datastr, const char
 int findnextstr(int can_display_wrap, int wholeword, const filestruct
        *begin, size_t beginx, const char *needle, int no_sameline);
 int do_search(void);
+#ifndef NANO_SMALL
 int do_research(void);
+#endif
 void replace_abort(void);
 #ifdef HAVE_REGEX_H
 int replace_regexp(char *string, int create_flag);

diff --git a/src/search.c b/src/search.c
index eed733c8f7d6e1457632ec6196a6679fb250b3e1..588111f8fa179a1cb91d55f28e38bcffc9a1474a 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -420,6 +420,7 @@ int do_search(void)
     return 1;
 }
 
+#ifndef NANO_SMALL
 /* Search for the next string without prompting. */
 int do_research(void)
 {
@@ -471,6 +472,7 @@ int do_research(void)
 
     return 1;
 }
+#endif
 
 void replace_abort(void)
 {