Mercurial > vim

comparison src/spellfile.c @ 15543:dd725a8ab112 v8.1.0779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0779: argument for message functions is inconsistent commit https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 19 17:43:09 2019 +0100 patch 8.1.0779: argument for message functions is inconsistent Problem: Argument for message functions is inconsistent. Solution: Make first argument to msg() "char *".
author Bram Moolenaar <Bram@vim.org>
date Sat, 19 Jan 2019 17:45:07 +0100
parents 98c35d312987
children 62b3805506b3
comparison
equal deleted inserted replaced
15542:5baedae7ca7a 15543:dd725a8ab112
2112 { 2112 {
2113 /* Done this node before, print the reference. */ 2113 /* Done this node before, print the reference. */
2114 PRINTSOME(line1, depth, "(%d)", node->wn_nr, 0); 2114 PRINTSOME(line1, depth, "(%d)", node->wn_nr, 0);
2115 PRINTSOME(line2, depth, " ", 0, 0); 2115 PRINTSOME(line2, depth, " ", 0, 0);
2116 PRINTSOME(line3, depth, " ", 0, 0); 2116 PRINTSOME(line3, depth, " ", 0, 0);
2117 msg((char_u *)line1); 2117 msg(line1);
2118 msg((char_u *)line2); 2118 msg(line2);
2119 msg((char_u *)line3); 2119 msg(line3);
2120 } 2120 }
2121 else 2121 else
2122 { 2122 {
2123 node->wn_u1.index = TRUE; 2123 node->wn_u1.index = TRUE;
2124 2124
2140 else 2140 else
2141 PRINTSOME(line3, depth, " ", 0, 0); 2141 PRINTSOME(line3, depth, " ", 0, 0);
2142 2142
2143 if (node->wn_byte == NUL) 2143 if (node->wn_byte == NUL)
2144 { 2144 {
2145 msg((char_u *)line1); 2145 msg(line1);
2146 msg((char_u *)line2); 2146 msg(line2);
2147 msg((char_u *)line3); 2147 msg(line3);
2148 } 2148 }
2149 2149
2150 /* do the children */ 2150 /* do the children */
2151 if (node->wn_byte != NUL && node->wn_child != NULL) 2151 if (node->wn_byte != NUL && node->wn_child != NULL)
2152 spell_print_node(node->wn_child, depth + 1); 2152 spell_print_node(node->wn_child, depth + 1);
3083 3083
3084 /* Check that we didn't use too many renumbered flags. */ 3084 /* Check that we didn't use too many renumbered flags. */
3085 if (spin->si_newcompID < spin->si_newprefID) 3085 if (spin->si_newcompID < spin->si_newprefID)
3086 { 3086 {
3087 if (spin->si_newcompID == 127 || spin->si_newcompID == 255) 3087 if (spin->si_newcompID == 127 || spin->si_newcompID == 255)
3088 MSG(_("Too many postponed prefixes")); 3088 msg(_("Too many postponed prefixes"));
3089 else if (spin->si_newprefID == 0 || spin->si_newprefID == 127) 3089 else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
3090 MSG(_("Too many compound flags")); 3090 msg(_("Too many compound flags"));
3091 else 3091 else
3092 MSG(_("Too many postponed prefixes and/or compound flags")); 3092 msg(_("Too many postponed prefixes and/or compound flags"));
3093 } 3093 }
3094 3094
3095 if (syllable != NULL) 3095 if (syllable != NULL)
3096 { 3096 {
3097 aff_check_string(spin->si_syllable, syllable, "SYLLABLE"); 3097 aff_check_string(spin->si_syllable, syllable, "SYLLABLE");
3638 spin->si_msg_count = 0; 3638 spin->si_msg_count = 0;
3639 vim_snprintf((char *)message, sizeof(message), 3639 vim_snprintf((char *)message, sizeof(message),
3640 _("line %6d, word %6ld - %s"), 3640 _("line %6d, word %6ld - %s"),
3641 lnum, spin->si_foldwcount + spin->si_keepwcount, w); 3641 lnum, spin->si_foldwcount + spin->si_keepwcount, w);
3642 msg_start(); 3642 msg_start();
3643 msg_puts_long_attr(message, 0); 3643 msg_outtrans_long_attr(message, 0);
3644 msg_clr_eos(); 3644 msg_clr_eos();
3645 msg_didout = FALSE; 3645 msg_didout = FALSE;
3646 msg_col = 0; 3646 msg_col = 0;
3647 out_flush(); 3647 out_flush();
3648 } 3648 }
4616 spin->si_compress_cnt = compress_added; 4616 spin->si_compress_cnt = compress_added;
4617 4617
4618 if (spin->si_verbose) 4618 if (spin->si_verbose)
4619 { 4619 {
4620 msg_start(); 4620 msg_start();
4621 msg_puts((char_u *)_(msg_compressing)); 4621 msg_puts(_(msg_compressing));
4622 msg_clr_eos(); 4622 msg_clr_eos();
4623 msg_didout = FALSE; 4623 msg_didout = FALSE;
4624 msg_col = 0; 4624 msg_col = 0;
4625 out_flush(); 4625 out_flush();
4626 } 4626 }
6117 convert_setup(&spin.si_conv, NULL, NULL); 6117 convert_setup(&spin.si_conv, NULL, NULL);
6118 #endif 6118 #endif
6119 } 6119 }
6120 6120
6121 if (spin.si_compflags != NULL && spin.si_nobreak) 6121 if (spin.si_compflags != NULL && spin.si_nobreak)
6122 MSG(_("Warning: both compounding and NOBREAK specified")); 6122 msg(_("Warning: both compounding and NOBREAK specified"));
6123 6123
6124 if (!error && !got_int) 6124 if (!error && !got_int)
6125 { 6125 {
6126 /* 6126 /*
6127 * Combine tails in the tree. 6127 * Combine tails in the tree.
6195 { 6195 {
6196 if (spin->si_verbose || p_verbose > 2) 6196 if (spin->si_verbose || p_verbose > 2)
6197 { 6197 {
6198 if (!spin->si_verbose) 6198 if (!spin->si_verbose)
6199 verbose_enter(); 6199 verbose_enter();
6200 MSG(str); 6200 msg((char *)str);
6201 out_flush(); 6201 out_flush();
6202 if (!spin->si_verbose) 6202 if (!spin->si_verbose)
6203 verbose_leave(); 6203 verbose_leave();
6204 } 6204 }
6205 } 6205 }