mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 04:41:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Not leaving curses mode in the formatter, as that would hide

Browse Source 
error messages upon reentry.  And, if there are any messages,
allowing the user a little time to read them.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5632 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-02-11 16:57:52 +00:00
parent d4118efea5
commit e39938c1fa
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
2016-02-11 Benno Schulenberg <bensberg@justemail.net> 2016-02-11 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_linter): Go to the next item in the list before * src/text.c (do_linter): Go to the next item in the list before
freeing the current one. This fixes Savannah bug #46796. freeing the current one. This fixes Savannah bug #46796.
* src/text.c (do_formatter): Don't leave curses mode, as that would
hide any error messages upon reentry. And if there are any messages,
allow the user a little time to read them.
2016-02-10 Benno Schulenberg <bensberg@justemail.net> 2016-02-10 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (discard_until): Prevent a chain of editing actions from * src/text.c (discard_until): Prevent a chain of editing actions from

16
src/text.c
View File

@ -3254,8 +3254,6 @@ void do_formatter(void)
blank_bottombars(); blank_bottombars();
statusbar(_("Invoking formatter, please wait")); statusbar(_("Invoking formatter, please wait"));
endwin();
/* Set up an argument list to pass to execvp(). */ /* Set up an argument list to pass to execvp(). */
if (formatargs == NULL) { if (formatargs == NULL) {
formatargs = (char **)nmalloc(arglen * sizeof(char *)); formatargs = (char **)nmalloc(arglen * sizeof(char *));
@ -3296,12 +3294,6 @@ void do_formatter(void)
/* Wait for the formatter to finish. */ /* Wait for the formatter to finish. */
wait(&format_status); wait(&format_status);
/* Reenter curses mode. */
doupdate();
/* Restore the terminal to its previous state. */
terminal_init();
if (!WIFEXITED(format_status) || WEXITSTATUS(format_status) != 0) if (!WIFEXITED(format_status) || WEXITSTATUS(format_status) != 0)
finalstatus = invocation_error(openfile->syntax->formatter); finalstatus = invocation_error(openfile->syntax->formatter);
else { else {
@ -3327,11 +3319,15 @@ void do_formatter(void)
allow_sigwinch(TRUE); allow_sigwinch(TRUE);
#endif #endif
statusbar(finalstatus);
/* If there were error messages, allow the user some time to read them. */
if (WIFEXITED(format_status) && WEXITSTATUS(format_status) == 2)
sleep(4);
/* If the formatter printed any error messages onscreen, make /* If the formatter printed any error messages onscreen, make
* sure that they're cleared off. */ * sure that they're cleared off. */
total_refresh(); total_refresh();
statusbar(finalstatus);
} }
#endif /* !DISABLE_SPELLER */ #endif /* !DISABLE_SPELLER */
#endif /* !DISABLE_COLOR */ #endif /* !DISABLE_COLOR */