nano

commit 26fd9b29a3b025b63ee690d201fdeb10e0d0f3b1
parent 1db6de4c256233864986b4bfa92396ae43320f6d
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Fri,  4 Apr 2014 15:31:40 +0000

Fixing compilation with --enable-browser and tiny.


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

Diffstat:
M
ChangeLog
 | 
3
++-
M
src/proto.h
 | 
2
+-
M
src/search.c
 | 
2
+-

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -6,11 +6,12 @@
 	to suppress a fatal-error message, make sure the user sees it.
 	* src/color.c: Comment tweaks.
 	* src/{*.h,*.c}, configure.ac:Convert all occurrences of
-	#ifdef ENABLE_COLOR to #ifndef DISABLE_COLOR.⏎
+	#ifdef ENABLE_COLOR to #ifndef DISABLE_COLOR.
 	* src/nano.h: Comment tweaks.
 	* configure.ac: Move the enabling stuff to after the disablers.
 	* configure.ac: Add submissive colour disabling to --enable-tiny.
 	* configure.ac: Allow other enablers to override --enable-tiny too.
+	* src/{proto.h,search.c}: Fix compilation with --enable-browser.
 
 2014-04-03  Benno Schulenberg  <bensberg@justemail.net>
 	* configure.ac: Remove unused '*_support' variables.
diff --git a/src/proto.h b/src/proto.h
@@ -588,7 +588,7 @@ bool findnextstr(
 	char *needle, size_t *needle_len);
 void findnextstr_wrap_reset(void);
 void do_search(void);
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
 void do_research(void);
 #endif
 #ifdef HAVE_REGEX_H
diff --git a/src/search.c b/src/search.c
@@ -525,7 +525,7 @@ void do_search(void)
     search_replace_abort();
 }
 
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
 /* Search for the last string without prompting. */
 void do_research(void)
 {