2014-05-10 Chris Allegretta <chrisa@asty.org>

        * src/rcfile.c (parse_color_names): Redefine false and true to
          their appropriate macro names so --with-slang works (slangv2 anyway).
        * src/text.c (do_linter): Care about whether user cancelled the file
          save (cancel the operation) versus justy said no (continue but don't
          save the file).  Also doupdate() after statusbar message that
          linter is being invoked and blank the shortcuts to draw the eye.
          Also allow user to cancel at the "open in a new buffer" prompt.
          New function lint_cleanup().  Fixes Savannah bug 42203.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4855 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 2a265ded1b5fd2eeafa238e3b2b442c98b910e8c..effcbe66a562f67312d05ebc41dcaa22a100b3d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-10 Chris Allegretta <chrisa@asty.org>
+       * src/rcfile.c (parse_color_names): Redefine false and true to
+         their appropriate macro names so --with-slang works (slangv2 anyway).
+       * src/text.c (do_linter): Care about whether user cancelled the file
+         save (cancel the operation) versus justy said no (continue but don't
+         save the file).  Also doupdate() after statusbar message that
+         linter is being invoked and blank the shortcuts to draw the eye.
+         Also allow user to cancel at the "open in a new buffer" prompt.
+         New function lint_cleanup().  Fixes Savannah bug 42203.
+
 2014-05-10  Benno Schulenberg  <bensberg@justemail.net>
        * doc/texinfo/nano.texi: Make syntax highlighting into a separate
        section, and add the still missing section on rebinding keys.

diff --git a/src/rcfile.c b/src/rcfile.c
index a11f8c05baa1641dbaa9f06b8ebc1785eaccdda4..680e130bd5a60b792b42e8c67e29b2640c025e63 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -846,7 +846,7 @@ bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
     bool no_fgcolor = FALSE;
 
     if (combostr == NULL)
-       return false;
+       return FALSE;
 
     if (strchr(combostr, ',') != NULL) {
        char *bgcolorname;
@@ -860,7 +860,7 @@ bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
        }
        if (strncasecmp(bgcolorname, "bright", 6) == 0) {
            rcfile_error(N_("Background color \"%s\" cannot be bright"), bgcolorname);
-           return false;
+           return FALSE;
        }
        *bg = color_to_short(bgcolorname, bright);
     } else
@@ -871,11 +871,11 @@ bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
 
        /* Don't try to parse screwed-up foreground colors. */
        if (*fg == -1)
-           return false;
+           return FALSE;
     } else
        *fg = -1;
 
-    return true;
+    return TRUE;
 }
 
 /* Parse the header-line regex that may influence the choice of syntax. */

diff --git a/src/text.c b/src/text.c
index 4cdb0cdda0deed183b7a38a52c1f901e655d5183..cb6d31301ed5fd2852c609352e7b5ff04b01debc 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -2980,6 +2980,14 @@ void do_spell(void)
 #endif /* !DISABLE_SPELLER */
 
 #ifndef DISABLE_COLOR
+/* Cleanup things to do after leaving the linter */
+void lint_cleanup(void)
+{
+    currmenu = MMAIN;
+    display_main_list();
+}
+
+
 /* Run linter.  Based on alt-speller code.  Return NULL for normal
  * termination, and the error string otherwise. */
 void do_linter(void)
@@ -3010,9 +3018,13 @@ void do_linter(void)
     if (openfile->modified) {
        int i = do_yesno_prompt(FALSE,
                 _("Save modified buffer before linting?"));
-
-       if (i == 1) {
+       if (i == -1) {
+           statusbar(_("Cancelled"));
+           lint_cleanup();
+           return;
+       } else if (i == 1) {
            if (do_writeout(FALSE) != TRUE) {
+               lint_cleanup();
                return;
            }
        }
@@ -3022,10 +3034,13 @@ void do_linter(void)
     /* Create pipe up front. */
     if (pipe(lint_fd) == -1) {
        statusbar(_("Could not create pipe"));
+       lint_cleanup();
        return;
     }
 
+    blank_bottombars();
     statusbar(_("Invoking linter, please wait"));
+    doupdate();
 
     /* Set up an argument list to pass execvp(). */
     if (lintargs == NULL) {
@@ -3070,6 +3085,7 @@ void do_linter(void)
     if (pid_lint < 0) {
        close(lint_fd[0]);
        statusbar(_("Could not fork"));
+       lint_cleanup();
        return;
     }
 
@@ -3077,6 +3093,7 @@ void do_linter(void)
     if ((pipe_buff_size = fpathconf(lint_fd[0], _PC_PIPE_BUF)) < 1) {
        close(lint_fd[0]);
        statusbar(_("Could not get size of pipe buffer"));
+       lint_cleanup();
        return;
     }
 
@@ -3179,6 +3196,7 @@ void do_linter(void)
 
     if (parsesuccess == 0) {
        statusbar(_("Got 0 parsable lines from command: %s"), openfile->syntax->linter);
+       lint_cleanup();
        return;
     }
 
@@ -3215,7 +3233,10 @@ void do_linter(void)
                                curlint->filename);
                        i = do_yesno_prompt(FALSE, msg);
                        free(msg);
-                       if (i == 1) {
+                       if (i == -1) {
+                           statusbar(_("Cancelled"));
+                           goto free_lints_and_return;
+                       } else if (i == 1) {
                            SET(MULTIBUFFER);
                            open_buffer(curlint->filename, FALSE);
                        } else {
@@ -3268,14 +3289,14 @@ void do_linter(void)
            }
        }
     }
+    blank_statusbar();
+free_lints_and_return:
     for (tmplint = lints; tmplint != NULL; tmplint = tmplint->next) {
        free(tmplint->msg);
        free(tmplint->filename);
        free(tmplint);
     }
-    blank_statusbar();
-    currmenu = MMAIN;
-    display_main_list();
+    lint_cleanup();
 }
 #endif /* !DISABLE_COLOR */