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

various #ifdef fixes 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2703 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-06-16 20:58:19 +00:00
parent 5c8197d78f
commit c4ca596a90
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -214,6 +214,9 @@ CVS code -
- Add macro charset(), a wrapper that calls memset(). (DLR) - Add macro charset(), a wrapper that calls memset(). (DLR)
- Readd #defines for the isblank() and iswblank() equivalents. - Readd #defines for the isblank() and iswblank() equivalents.
(DLR) (DLR)
- proto.h:
- Add missing NANO_SMALL and HAVE_REGEX_H #ifdefs around the
do_find_bracket() prototype. (DLR)
- rcfile.c: - rcfile.c:
color_to_int() color_to_int()
- Since colorname's being NULL is handled elsewhere now, assert - Since colorname's being NULL is handled elsewhere now, assert

2
src/global.c
View File

@ -617,7 +617,7 @@ void shortcut_init(bool unjustify)
NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_full_justify); NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_full_justify);
#endif #endif
#if !defined(NANO_SMALL) && defined(HAVE_REGEX_H) #if defined(HAVE_REGEX_H) && !defined(NANO_SMALL)
sc_init_one(&main_list, NANO_NO_KEY, N_("Find Other Bracket"), sc_init_one(&main_list, NANO_NO_KEY, N_("Find Other Bracket"),
IFHELP(nano_bracket_msg, NANO_BRACKET_KEY), NANO_NO_KEY, IFHELP(nano_bracket_msg, NANO_BRACKET_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, do_find_bracket); NANO_NO_KEY, VIEW, do_find_bracket);

6
src/proto.h
View File

@ -530,8 +530,10 @@ void do_gotolinecolumn_void(void);
#if defined(ENABLE_MULTIBUFFER) || !defined(DISABLE_SPELLER) #if defined(ENABLE_MULTIBUFFER) || !defined(DISABLE_SPELLER)
void do_gotopos(int line, size_t pos_x, int pos_y, size_t pos_pww); void do_gotopos(int line, size_t pos_x, int pos_y, size_t pos_pww);
#endif #endif
void do_find_bracket(void);
#ifndef NANO_SMALL #ifndef NANO_SMALL
#ifdef HAVE_REGEX_H
void do_find_bracket(void);
#endif
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
bool history_has_changed(void); bool history_has_changed(void);
#endif #endif
@ -544,7 +546,7 @@ char *get_history_newer(filestruct **h);
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
char *get_history_completion(filestruct **h, char *s, size_t len); char *get_history_completion(filestruct **h, char *s, size_t len);
#endif #endif
#endif #endif /* !NANO_SMALL */
/* Public functions in utils.c. */ /* Public functions in utils.c. */
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H

8
src/search.c
View File

@ -1038,7 +1038,8 @@ void do_gotopos(int line, size_t pos_x, int pos_y, size_t pos_pww)
} }
#endif #endif
#if !defined(NANO_SMALL) && defined(HAVE_REGEX_H) #ifndef NANO_SMALL
#ifdef HAVE_REGEX_H
void do_find_bracket(void) void do_find_bracket(void)
{ {
const char *pos, *bracket_pat = "([{<>}])"; const char *pos, *bracket_pat = "([{<>}])";
@ -1121,9 +1122,8 @@ void do_find_bracket(void)
if (!regexp_set) if (!regexp_set)
UNSET(USE_REGEXP); UNSET(USE_REGEXP);
} }
#endif #endif /* HAVE_REGEX_H */
#ifndef NANO_SMALL
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
/* Indicate whether any of the history lists have changed. */ /* Indicate whether any of the history lists have changed. */
bool history_has_changed(void) bool history_has_changed(void)
@ -1308,4 +1308,4 @@ char *get_history_completion(filestruct **h, char *s, size_t len)
return s; return s;
} }
#endif #endif
#endif /* !NANO_SMALL && ENABLE_NANORC */ #endif /* !NANO_SMALL */