patch 7.4.1050

Problem:    Warning for unused var with tiny features. (Tony Mechelynck)
Solution:   Add #ifdef.  Use vim_snprintf().  Reduce number of statemements.

diff --git a/src/ops.c b/src/ops.c
index d67c2240e1cdcc66584f97fa94e6b31dc4a6da48..d02b784d44cf02ba648b49612ca1e308ea747598 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -6974,7 +6974,9 @@ cursor_pos_info(dict)
     char_u     buf2[40];
     linenr_T   lnum;
     long       byte_count = 0;
+#ifdef FEAT_MBYTE
     long       bom_count  = 0;
+#endif
     long       byte_count_cursor = 0;
     long       char_count = 0;
     long       char_count_cursor = 0;
@@ -7190,15 +7192,15 @@ cursor_pos_info(dict)
            }
        }
 
-       /* Don't shorten this message, the user asked for it. */
 #ifdef FEAT_MBYTE
        bom_count = bomb_size();
        if (bom_count > 0)
-           sprintf((char *)IObuff + STRLEN(IObuff), _("(+%ld for BOM)"),
-                                                               bom_count);
+           vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE,
+                                             _("(+%ld for BOM)"), bom_count);
 #endif
        if (dict == NULL)
        {
+           /* Don't shorten this message, the user asked for it. */
            p = p_shm;
            p_shm = (char_u *)"";
            msg(IObuff);
@@ -7210,19 +7212,17 @@ cursor_pos_info(dict)
     {
        dict_add_nr_str(dict, "words", (long)word_count, NULL);
        dict_add_nr_str(dict, "chars", (long)char_count, NULL);
-       dict_add_nr_str(dict, "bytes", (long)byte_count + bom_count, NULL);
-       if (VIsual_active)
-       {
-           dict_add_nr_str(dict, "visual_bytes", (long)byte_count_cursor, NULL);
-           dict_add_nr_str(dict, "visual_chars", (long)char_count_cursor, NULL);
-           dict_add_nr_str(dict, "visual_words", (long)word_count_cursor, NULL);
-       }
-       else
-       {
-           dict_add_nr_str(dict, "cursor_bytes", (long)byte_count_cursor, NULL);
-           dict_add_nr_str(dict, "cursor_chars", (long)char_count_cursor, NULL);
-           dict_add_nr_str(dict, "cursor_words", (long)word_count_cursor, NULL);
-       }
+       dict_add_nr_str(dict, "bytes", (long)byte_count
+# ifdef FEAT_MBYTE
+               + bom_count
+# endif
+               , NULL);
+       dict_add_nr_str(dict, VIsual_active ? "visual_bytes" : "cursor_bytes",
+               (long)byte_count_cursor, NULL);
+       dict_add_nr_str(dict, VIsual_active ? "visual_chars" : "cursor_chars",
+               (long)char_count_cursor, NULL);
+       dict_add_nr_str(dict, VIsual_active ? "visual_words" : "cursor_words",
+               (long)word_count_cursor, NULL);
     }
 #endif
 }

diff --git a/src/version.c b/src/version.c
index bf37507ba9514fdbae41edc8c1909d10c9b0bf6c..470cce8a98ad65e15cbec889aa713327f08caf78 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1050,
 /**/
     1049,
 /**/