Mercurial > vim

comparison src/menu.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 55ccc2d353bd
children 9bd2372432cf
comparison
equal deleted inserted replaced
15542:5baedae7ca7a 15543:dd725a8ab112
1149 } 1149 }
1150 vim_free(path_name); 1150 vim_free(path_name);
1151 1151
1152 /* Now we have found the matching menu, and we list the mappings */ 1152 /* Now we have found the matching menu, and we list the mappings */
1153 /* Highlight title */ 1153 /* Highlight title */
1154 MSG_PUTS_TITLE(_("\n--- Menus ---")); 1154 msg_puts_title(_("\n--- Menus ---"));
1155 1155
1156 show_menus_recursive(parent, modes, 0); 1156 show_menus_recursive(parent, modes, 0);
1157 return OK; 1157 return OK;
1158 } 1158 }
1159 1159
1173 { 1173 {
1174 msg_putchar('\n'); 1174 msg_putchar('\n');
1175 if (got_int) /* "q" hit for "--more--" */ 1175 if (got_int) /* "q" hit for "--more--" */
1176 return; 1176 return;
1177 for (i = 0; i < depth; i++) 1177 for (i = 0; i < depth; i++)
1178 MSG_PUTS(" "); 1178 msg_puts(" ");
1179 if (menu->priority) 1179 if (menu->priority)
1180 { 1180 {
1181 msg_outnum((long)menu->priority); 1181 msg_outnum((long)menu->priority);
1182 MSG_PUTS(" "); 1182 msg_puts(" ");
1183 } 1183 }
1184 /* Same highlighting as for directories!? */ 1184 /* Same highlighting as for directories!? */
1185 msg_outtrans_attr(menu->name, HL_ATTR(HLF_D)); 1185 msg_outtrans_attr(menu->name, HL_ATTR(HLF_D));
1186 } 1186 }
1187 1187
1192 { 1192 {
1193 msg_putchar('\n'); 1193 msg_putchar('\n');
1194 if (got_int) /* "q" hit for "--more--" */ 1194 if (got_int) /* "q" hit for "--more--" */
1195 return; 1195 return;
1196 for (i = 0; i < depth + 2; i++) 1196 for (i = 0; i < depth + 2; i++)
1197 MSG_PUTS(" "); 1197 msg_puts(" ");
1198 msg_puts((char_u*)menu_mode_chars[bit]); 1198 msg_puts(menu_mode_chars[bit]);
1199 if (menu->noremap[bit] == REMAP_NONE) 1199 if (menu->noremap[bit] == REMAP_NONE)
1200 msg_putchar('*'); 1200 msg_putchar('*');
1201 else if (menu->noremap[bit] == REMAP_SCRIPT) 1201 else if (menu->noremap[bit] == REMAP_SCRIPT)
1202 msg_putchar('&'); 1202 msg_putchar('&');
1203 else 1203 else
1208 msg_putchar(' '); 1208 msg_putchar(' ');
1209 if ((menu->modes & menu->enabled & (1 << bit)) == 0) 1209 if ((menu->modes & menu->enabled & (1 << bit)) == 0)
1210 msg_putchar('-'); 1210 msg_putchar('-');
1211 else 1211 else
1212 msg_putchar(' '); 1212 msg_putchar(' ');
1213 MSG_PUTS(" "); 1213 msg_puts(" ");
1214 if (*menu->strings[bit] == NUL) 1214 if (*menu->strings[bit] == NUL)
1215 msg_puts_attr((char_u *)"<Nop>", HL_ATTR(HLF_8)); 1215 msg_puts_attr("<Nop>", HL_ATTR(HLF_8));
1216 else 1216 else
1217 msg_outtrans_special(menu->strings[bit], FALSE); 1217 msg_outtrans_special(menu->strings[bit], FALSE);
1218 } 1218 }
1219 } 1219 }
1220 else 1220 else