Changed ENABLE_BROWSER to DISABLE_BROWSER, tiny build now doesn't build browser either

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

acconfig.h

@@ -39,5 +39,5 @@
 /* Define this to disable the ^G help menu */
 #undef DISABLE_HELP
 
-/* Define this to use the built-in (crappy) file browser */
-#undef ENABLE_BROWSER
+/* Define this to disable the built-in (crappy) file browser */
+#undef DISABLE_BROWSER

config.h.in

@@ -91,8 +91,8 @@
 /* Define this to disable the ^G help menu */
 #undef DISABLE_HELP
 
-/* Define this to use the built-in (crappy) file browser */
-#undef ENABLE_BROWSER
+/* Define this to disable the built-in (crappy) file browser */
+#undef DISABLE_BROWSER
 
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT

configure.in

@@ -52,15 +52,9 @@ AC_ARG_ENABLE(help,
  fi])
 
 AC_ARG_ENABLE(browser,
-[  --enable-browser        Enable mini file browser],
- [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_BROWSER)
- fi])
-
-AC_ARG_ENABLE(browser,
-[  --enable-browser        Enable mini file browser],
- [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_BROWSER)
+[  --disable-browser       Disables mini file browser],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_BROWSER)
  fi])
 
 AC_MSG_CHECKING(whether to use slang)

files.c

@@ -271,7 +271,7 @@ int do_insertfile(void)
 	realname = mallocstrcpy(realname, answer);
 #endif
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 	if (i == NANO_TOFILES_KEY) {
 	    char *tmp = do_browser(getcwd(NULL, 0));
 
@@ -524,7 +524,7 @@ int do_writeout(int exiting)
 
 	if (i != -1) {
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 	if (i == NANO_TOFILES_KEY) {
 	    char *tmp = do_browser(getcwd(NULL, 0));
 
@@ -1053,7 +1053,7 @@ char *input_tab(char *buf, int place, int *lastWasTab, int *newplace)
 }
 #endif
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 
 /* Return the stat of the file pointed to by path */
 struct stat filestat(const char *path) {

global.c

@@ -79,7 +79,7 @@ shortcut goto_list[GOTO_LIST_LEN];
 shortcut writefile_list[WRITEFILE_LIST_LEN];
 shortcut help_list[HELP_LIST_LEN];
 shortcut spell_list[SPELL_LIST_LEN];
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 shortcut browser_list[BROWSER_LIST_LEN];
 #endif
 
@@ -174,9 +174,11 @@ void shortcut_init(int unjustify)
 	"", *nano_mark_msg = "", *nano_delete_msg =
 	"", *nano_backspace_msg = "", *nano_tab_msg =
 	"", *nano_enter_msg = "", *nano_case_msg =
-	"", *nano_cancel_msg = "", *nano_unjustify_msg = "", *nano_tofiles_msg = "";
+	"", *nano_cancel_msg = "", *nano_unjustify_msg = "";
 
 #ifndef NANO_SMALL
+    char *nano_tofiles_msg = "";
+
     nano_help_msg = _("Invoke the help menu");
     nano_writeout_msg = _("Write the current file to disk");
     nano_exit_msg = _("Exit from nano");
@@ -408,7 +410,7 @@ void shortcut_init(int unjustify)
 		nano_exit_msg, 0, NANO_EXIT_FKEY, 0, VIEW, do_exit);
 
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
     sc_init_one(&writefile_list[0], NANO_TOFILES_KEY, _("To Files"),
 		nano_tofiles_msg, 0, 0, 0, NOVIEW, 0);
 #endif
@@ -419,7 +421,7 @@ void shortcut_init(int unjustify)
     sc_init_one(&spell_list[0], NANO_CANCEL_KEY, _("Cancel"),
 		nano_cancel_msg, 0, 0, 0, VIEW, 0);
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
     sc_init_one(&browser_list[0], NANO_PREVPAGE_KEY, _("Prev Page"),
 		nano_prevpage_msg,
 		0, NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, 0);

nano.c

@@ -435,8 +435,8 @@ void version(void)
 #ifdef NANO_EXTRA
     printf(" --enable-extra");
 #endif
-#ifdef ENABLE_BROWSER
-    printf(" --enable-browser");
+#ifdef DISABLE_BROWSER
+    printf(" --disable-browser");
 #endif
 #ifdef DISABLE_TABCOMP
     printf(" --disable-tabcomp");

nano.h

@@ -247,7 +247,7 @@ know what you're doing */
 #define HELP_LIST_LEN 3
 #define SPELL_LIST_LEN 1
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 #define WRITEFILE_LIST_LEN 2
 #define BROWSER_LIST_LEN 3
 #else

proto.h

@@ -51,7 +51,7 @@ extern shortcut main_list[MAIN_LIST_LEN], whereis_list[WHEREIS_LIST_LEN];
 extern shortcut replace_list[REPLACE_LIST_LEN], goto_list[GOTO_LIST_LEN];
 extern shortcut writefile_list[WRITEFILE_LIST_LEN], help_list[HELP_LIST_LEN];
 extern shortcut spell_list[SPELL_LIST_LEN], replace_list_2[REPLACE_LIST_LEN];
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 extern shortcut browser_list[BROWSER_LIST_LEN];
 #endif
 
@@ -152,7 +152,7 @@ int do_delete(void), do_backspace(void), do_tab(void), do_justify(void);
 int do_first_line(void), do_last_line(void);
 int do_replace(void), do_help(void), do_enter_void(void);
 
-#ifdef ENABLE_BROWSER
+#if !defined(DISABLE_BROWSER) && !defined(NANO_SMALL)
 char *do_browser(char *path);
 #endif