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

Fixing compilation with --enable-browser and tiny. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4724 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-04 15:31:40 +00:00
parent 1db6de4c25
commit 26fd9b29a3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,11 +6,12 @@
to suppress a fatal-error message, make sure the user sees it. to suppress a fatal-error message, make sure the user sees it.
* src/color.c: Comment tweaks. * src/color.c: Comment tweaks.
* src/{*.h,*.c}, configure.ac:Convert all occurrences of * 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. * src/nano.h: Comment tweaks.
* configure.ac: Move the enabling stuff to after the disablers. * configure.ac: Move the enabling stuff to after the disablers.
* configure.ac: Add submissive colour disabling to --enable-tiny. * configure.ac: Add submissive colour disabling to --enable-tiny.
* configure.ac: Allow other enablers to override --enable-tiny too. * 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> 2014-04-03 Benno Schulenberg <bensberg@justemail.net>
* configure.ac: Remove unused '*_support' variables. * configure.ac: Remove unused '*_support' variables.

2
src/proto.h
View File

@ -588,7 +588,7 @@ bool findnextstr(
char *needle, size_t *needle_len); char *needle, size_t *needle_len);
void findnextstr_wrap_reset(void); void findnextstr_wrap_reset(void);
void do_search(void); void do_search(void);
#ifndef NANO_TINY #if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
void do_research(void); void do_research(void);
#endif #endif
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H

2
src/search.c
View File

@ -525,7 +525,7 @@ void do_search(void)
search_replace_abort(); search_replace_abort();
} }
#ifndef NANO_TINY #if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
/* Search for the last string without prompting. */ /* Search for the last string without prompting. */
void do_research(void) void do_research(void)
{ {