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

Fixing compilation with --enable-tiny. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4824 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-27 15:26:25 +00:00
parent 4da2434dd7
commit 5f655da048
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@
show the important toggles early on, and group them better. show the important toggles early on, and group them better.
* src/global.c (shortcut_init): Improve order and grouping in the * src/global.c (shortcut_init): Improve order and grouping in the
main help text and help lines. main help text and help lines.
* src/global.c (strtosc): Fix compilation with --enable-tiny.
2014-04-27 Mark Majeres <mark@engine12.com> 2014-04-27 Mark Majeres <mark@engine12.com>
* src/rcfile.c (parse_include): Plug two tiny memory leaks. * src/rcfile.c (parse_include): Plug two tiny memory leaks.

10
src/global.c
View File

@ -483,7 +483,9 @@ void shortcut_init(void)
const char *gotoline_tag = N_("Go To Line"); const char *gotoline_tag = N_("Go To Line");
const char *prev_line_tag = N_("Prev Line"); const char *prev_line_tag = N_("Prev Line");
const char *next_line_tag = N_("Next Line"); const char *next_line_tag = N_("Next Line");
#ifndef DISABLE_JUSTIFY
const char *fulljustify_tag = N_("FullJstify"); const char *fulljustify_tag = N_("FullJstify");
#endif
const char *refresh_tag = N_("Refresh"); const char *refresh_tag = N_("Refresh");
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
const char *spell_tag = N_("To Spell"); const char *spell_tag = N_("To Spell");
@ -1278,22 +1280,26 @@ sc *strtosc(char *input)
s->scfunc = do_insertfile_void; s->scfunc = do_insertfile_void;
else if (!strcasecmp(input, "whereis")) else if (!strcasecmp(input, "whereis"))
s->scfunc = do_search; s->scfunc = do_search;
#ifndef NANO_TINY
else if (!strcasecmp(input, "searchagain") || else if (!strcasecmp(input, "searchagain") ||
!strcasecmp(input, "research")) !strcasecmp(input, "research"))
s->scfunc = do_research; s->scfunc = do_research;
#endif
else if (!strcasecmp(input, "replace")) else if (!strcasecmp(input, "replace"))
s->scfunc = do_replace; s->scfunc = do_replace;
else if (!strcasecmp(input, "cut")) else if (!strcasecmp(input, "cut"))
s->scfunc = do_cut_text_void; s->scfunc = do_cut_text_void;
else if (!strcasecmp(input, "copytext"))
s->scfunc = do_copy_text;
else if (!strcasecmp(input, "uncut")) else if (!strcasecmp(input, "uncut"))
s->scfunc = do_uncut_text; s->scfunc = do_uncut_text;
#ifndef NANO_TINY
else if (!strcasecmp(input, "copytext"))
s->scfunc = do_copy_text;
else if (!strcasecmp(input, "mark")) else if (!strcasecmp(input, "mark"))
s->scfunc = do_mark; s->scfunc = do_mark;
else if (!strcasecmp(input, "tospell") || else if (!strcasecmp(input, "tospell") ||
!strcasecmp(input, "speller")) !strcasecmp(input, "speller"))
s->scfunc = do_spell; s->scfunc = do_spell;
#endif
else if (!strcasecmp(input, "curpos") || else if (!strcasecmp(input, "curpos") ||
!strcasecmp(input, "cursorpos")) !strcasecmp(input, "cursorpos"))
s->scfunc = do_cursorpos_void; s->scfunc = do_cursorpos_void;