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

Fixing compilation with --enable-tiny --enable-browser. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4996 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-06-20 15:35:26 +00:00
parent 492e9f605b
commit b0555990c2
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
* src/files.c (check_dotnano): Wrap long lines and actually report * src/files.c (check_dotnano): Wrap long lines and actually report
the name that is not a directory. the name that is not a directory.
* src/*: Miscellaneous whitespace adjustments and comment tweaks. * src/*: Miscellaneous whitespace adjustments and comment tweaks.
* src/files.c: Fix compilation with --enable-tiny --enable-browser.
2014-06-19 Benno Schulenberg <bensberg@justemail.net> 2014-06-19 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()' * src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()'

16
src/files.c
View File

@ -1010,8 +1010,8 @@ void do_insertfile(
size_t current_x_save = openfile->current_x; size_t current_x_save = openfile->current_x;
ssize_t current_y_save = openfile->current_y; ssize_t current_y_save = openfile->current_y;
bool edittop_inside = FALSE, meta_key = FALSE, func_key = FALSE; bool edittop_inside = FALSE, meta_key = FALSE, func_key = FALSE;
#ifndef NANO_TINY
const sc *s; const sc *s;
#ifndef NANO_TINY
bool right_side_up = FALSE, single_line = FALSE; bool right_side_up = FALSE, single_line = FALSE;
#endif #endif
@ -1026,17 +1026,16 @@ void do_insertfile(
_("Command to execute in new buffer [from %s] ") : _("Command to execute in new buffer [from %s] ") :
#endif #endif
_("Command to execute [from %s] "); _("Command to execute [from %s] ");
} else { } else
#endif #endif /* NANO_TINY */
{
msg = msg =
#ifndef DISABLE_MULTIBUFFER #ifndef DISABLE_MULTIBUFFER
ISSET(MULTIBUFFER) ? ISSET(MULTIBUFFER) ?
_("File to insert into new buffer [from %s] ") : _("File to insert into new buffer [from %s] ") :
#endif #endif
_("File to insert [from %s] "); _("File to insert [from %s] ");
#ifndef NANO_TINY
} }
#endif
i = do_prompt(TRUE, i = do_prompt(TRUE,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
@ -1073,24 +1072,21 @@ void do_insertfile(
ans = mallocstrcpy(ans, answer); ans = mallocstrcpy(ans, answer);
#ifndef NANO_TINY
s = get_shortcut(currmenu, &i, &meta_key); s = get_shortcut(currmenu, &i, &meta_key);
#ifndef NANO_TINY
#ifndef DISABLE_MULTIBUFFER #ifndef DISABLE_MULTIBUFFER
if (s && s->scfunc == new_buffer_void) { if (s && s->scfunc == new_buffer_void) {
/* Don't allow toggling if we're in view mode. */ /* Don't allow toggling if we're in view mode. */
if (!ISSET(VIEW_MODE)) if (!ISSET(VIEW_MODE))
TOGGLE(MULTIBUFFER); TOGGLE(MULTIBUFFER);
continue; continue;
} else }
#endif #endif
if (s && s->scfunc == flip_execute_void) { if (s && s->scfunc == flip_execute_void) {
execute = !execute; execute = !execute;
continue; continue;
} }
#ifndef DISABLE_BROWSER
else
#endif
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
#ifndef DISABLE_BROWSER #ifndef DISABLE_BROWSER