Mercurial > vim
comparison src/os_amiga.c @ 15543:dd725a8ab112 v8.1.0779
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 | 639b8318472c |
comparison
equal
deleted
inserted
replaced
15542:5baedae7ca7a | 15543:dd725a8ab112 |
---|---|
1228 if ((dos2 && x < 0) || (!dos2 && !x)) | 1228 if ((dos2 && x < 0) || (!dos2 && !x)) |
1229 # else | 1229 # else |
1230 if (x < 0) | 1230 if (x < 0) |
1231 # endif | 1231 # endif |
1232 { | 1232 { |
1233 MSG_PUTS(_("Cannot execute ")); | 1233 msg_puts(_("Cannot execute ")); |
1234 if (cmd == NULL) | 1234 if (cmd == NULL) |
1235 { | 1235 { |
1236 MSG_PUTS(_("shell ")); | 1236 msg_puts(_("shell ")); |
1237 msg_outtrans(p_sh); | 1237 msg_outtrans(p_sh); |
1238 } | 1238 } |
1239 else | 1239 else |
1240 msg_outtrans(cmd); | 1240 msg_outtrans(cmd); |
1241 msg_putchar('\n'); | 1241 msg_putchar('\n'); |
1251 { | 1251 { |
1252 if (!(options & SHELL_SILENT)) | 1252 if (!(options & SHELL_SILENT)) |
1253 { | 1253 { |
1254 msg_putchar('\n'); | 1254 msg_putchar('\n'); |
1255 msg_outnum((long)x); | 1255 msg_outnum((long)x); |
1256 MSG_PUTS(_(" returned\n")); | 1256 msg_puts(_(" returned\n")); |
1257 } | 1257 } |
1258 retval = x; | 1258 retval = x; |
1259 } | 1259 } |
1260 } | 1260 } |
1261 #else /* else part is for AZTEC_C */ | 1261 #else /* else part is for AZTEC_C */ |
1318 if ((dos2 && x < 0) || (!dos2 && x)) | 1318 if ((dos2 && x < 0) || (!dos2 && x)) |
1319 # else | 1319 # else |
1320 if (x < 0) | 1320 if (x < 0) |
1321 # endif | 1321 # endif |
1322 { | 1322 { |
1323 MSG_PUTS(_("Cannot execute ")); | 1323 msg_puts(_("Cannot execute ")); |
1324 if (use_execute) | 1324 if (use_execute) |
1325 { | 1325 { |
1326 if (cmd == NULL) | 1326 if (cmd == NULL) |
1327 msg_outtrans(p_sh); | 1327 msg_outtrans(p_sh); |
1328 else | 1328 else |
1329 msg_outtrans(cmd); | 1329 msg_outtrans(cmd); |
1330 } | 1330 } |
1331 else | 1331 else |
1332 { | 1332 { |
1333 MSG_PUTS(_("shell ")); | 1333 msg_puts(_("shell ")); |
1334 msg_outtrans(shellcmd); | 1334 msg_outtrans(shellcmd); |
1335 } | 1335 } |
1336 msg_putchar('\n'); | 1336 msg_putchar('\n'); |
1337 retval = -1; | 1337 retval = -1; |
1338 } | 1338 } |
1353 { | 1353 { |
1354 if (!(options & SHELL_SILENT) && !emsg_silent) | 1354 if (!(options & SHELL_SILENT) && !emsg_silent) |
1355 { | 1355 { |
1356 msg_putchar('\n'); | 1356 msg_putchar('\n'); |
1357 msg_outnum((long)x); | 1357 msg_outnum((long)x); |
1358 MSG_PUTS(_(" returned\n")); | 1358 msg_puts(_(" returned\n")); |
1359 } | 1359 } |
1360 retval = x; | 1360 retval = x; |
1361 } | 1361 } |
1362 } | 1362 } |
1363 vim_free(shellcmd); | 1363 vim_free(shellcmd); |