patch 8.0.1758: open_line() returns TRUE/FALSE for success/failure

Problem:    open_line() returns TRUE/FALSE for success/failure.
Solution:   Return OK or FAIL.

diff --git a/src/edit.c b/src/edit.c
index 8746436fbae24f991643fb0a8089b1597d9d6d06..f29fbc79bea7da4d9c09721107469fcf5d90900a 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -1374,7 +1374,7 @@ doESCkey:
                goto doESCkey;
            }
 #endif
-           if (ins_eol(c) && !p_im)
+           if (ins_eol(c) == FAIL && !p_im)
                goto doESCkey;      /* out of memory */
            auto_format(FALSE, FALSE);
            inserted_space = FALSE;
@@ -10201,7 +10201,7 @@ ins_tab(void)
 
 /*
  * Handle CR or NL in insert mode.
- * Return TRUE when out of memory or can't undo.
+ * Return FAIL when out of memory or can't undo.
  */
     static int
 ins_eol(int c)
@@ -10266,7 +10266,7 @@ ins_eol(int c)
     foldOpenCursor();
 #endif
 
-    return (!i);
+    return i;
 }
 
 #ifdef FEAT_DIGRAPHS

diff --git a/src/misc1.c b/src/misc1.c
index 531c5e423b018fc589fc777538fc5e5547abf7f1..de79c8e8152ac281273a0b0e23b6564005e28585 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -588,7 +588,7 @@ cin_is_cinword(char_u *line)
  * "second_line_indent": indent for after ^^D in Insert mode or if flag
  *                       OPENLINE_COM_LIST
  *
- * Return TRUE for success, FALSE for failure
+ * Return OK for success, FAIL for failure
  */
     int
 open_line(
@@ -606,7 +606,7 @@ open_line(
     int                newindent = 0;          /* auto-indent of the new line */
     int                n;
     int                trunc_line = FALSE;     /* truncate current line afterwards */
-    int                retval = FALSE;         /* return value, default is FAIL */
+    int                retval = FAIL;          /* return value */
 #ifdef FEAT_COMMENTS
     int                extra_len = 0;          /* length of p_extra string */
     int                lead_len;               /* length of comment leader */
@@ -1642,7 +1642,7 @@ open_line(
     }
 #endif
 
-    retval = TRUE;             /* success! */
+    retval = OK;               /* success! */
 theend:
     curbuf->b_p_pi = saved_pi;
     vim_free(saved_line);

diff --git a/src/normal.c b/src/normal.c
index 84867b52f85ca50318bfc8b93eb9ff85a76fec94..be0e75e7e3bb18766a9991e8a4e122233d4f76a1 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -8491,7 +8491,7 @@ n_opencmd(cmdarg_T *cap)
 #ifdef FEAT_COMMENTS
                    has_format_option(FO_OPEN_COMS) ? OPENLINE_DO_COM :
 #endif
-                   0, 0))
+                   0, 0) == OK)
        {
 #ifdef FEAT_CONCEAL
            if (curwin->w_p_cole > 0 && oldline != curwin->w_cursor.lnum)

diff --git a/src/version.c b/src/version.c
index f0cb3047353a68cb6eb25ddc5a9ea4958971a511..dfd82f997256c17cdf1b8722986e104fa2938b45 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1758,
 /**/
     1757,
 /**/