tweaks: fix compilation with --enable-tiny --enable-color --enable-speller
Also avoid an unused-variable warning, and trim a useless assert.master
parent
1fbe7596f8
commit
a43eee6aec
|
@ -983,11 +983,9 @@ void do_enter(void)
|
||||||
{
|
{
|
||||||
filestruct *newnode = make_new_node(openfile->current);
|
filestruct *newnode = make_new_node(openfile->current);
|
||||||
size_t extra = 0;
|
size_t extra = 0;
|
||||||
|
#ifndef NANO_TINY
|
||||||
bool allblanks = FALSE;
|
bool allblanks = FALSE;
|
||||||
|
|
||||||
assert(openfile->current != NULL && openfile->current->data != NULL);
|
|
||||||
|
|
||||||
#ifndef NANO_TINY
|
|
||||||
if (ISSET(AUTOINDENT)) {
|
if (ISSET(AUTOINDENT)) {
|
||||||
extra = indent_length(openfile->current->data);
|
extra = indent_length(openfile->current->data);
|
||||||
|
|
||||||
|
@ -3390,8 +3388,10 @@ void do_formatter(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef NANO_TINY
|
||||||
/* We're not supporting partial formatting, oi vey. */
|
/* We're not supporting partial formatting, oi vey. */
|
||||||
openfile->mark_set = FALSE;
|
openfile->mark_set = FALSE;
|
||||||
|
#endif
|
||||||
status = write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
|
status = write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
|
||||||
|
|
||||||
if (!status) {
|
if (!status) {
|
||||||
|
@ -3457,10 +3457,11 @@ void do_formatter(void)
|
||||||
|
|
||||||
set_modified();
|
set_modified();
|
||||||
|
|
||||||
|
#ifndef NANO_TINY
|
||||||
/* Flush the undo stack, to avoid a mess or crash when
|
/* Flush the undo stack, to avoid a mess or crash when
|
||||||
* the user tries to undo things in reformatted lines. */
|
* the user tries to undo things in reformatted lines. */
|
||||||
discard_until(NULL, openfile);
|
discard_until(NULL, openfile);
|
||||||
|
#endif
|
||||||
finalstatus = _("Finished formatting");
|
finalstatus = _("Finished formatting");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue