Mercurial > vim

comparison src/sign.c @ 26865:bce848ec8b1b v8.2.3961

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3961: error messages are spread out Commit: https://github.com/vim/vim/commit/436b5adc9770a2568209dd5ab1f98bd1afc91898 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 31 22:49:24 2021 +0000 patch 8.2.3961: error messages are spread out Problem: Error messages are spread out. Solution: Move more errors to errors.h.
author Bram Moolenaar <Bram@vim.org>
date Sat, 01 Jan 2022 00:00:04 +0100
parents 806f31579357
children 06a137af96f8
comparison
equal deleted inserted replaced
26864:eb95ad159bce 26865:bce848ec8b1b
1377 arg += 6; 1377 arg += 6;
1378 numhl = vim_strnsave(arg, p - arg); 1378 numhl = vim_strnsave(arg, p - arg);
1379 } 1379 }
1380 else 1380 else
1381 { 1381 {
1382 semsg(_(e_invarg2), arg); 1382 semsg(_(e_invalid_argument_str), arg);
1383 failed = TRUE; 1383 failed = TRUE;
1384 break; 1384 break;
1385 } 1385 }
1386 } 1386 }
1387 1387
1420 // :sign place 1420 // :sign place
1421 // :sign place group={group} 1421 // :sign place group={group}
1422 // :sign place group=* 1422 // :sign place group=*
1423 if (lnum >= 0 || sign_name != NULL 1423 if (lnum >= 0 || sign_name != NULL
1424 || (group != NULL && *group == '\0')) 1424 || (group != NULL && *group == '\0'))
1425 emsg(_(e_invarg)); 1425 emsg(_(e_invalid_argument));
1426 else 1426 else
1427 sign_list_placed(buf, group); 1427 sign_list_placed(buf, group);
1428 } 1428 }
1429 else 1429 else
1430 { 1430 {
1431 // Place a new sign 1431 // Place a new sign
1432 if (sign_name == NULL || buf == NULL 1432 if (sign_name == NULL || buf == NULL
1433 || (group != NULL && *group == '\0')) 1433 || (group != NULL && *group == '\0'))
1434 { 1434 {
1435 emsg(_(e_invarg)); 1435 emsg(_(e_invalid_argument));
1436 return; 1436 return;
1437 } 1437 }
1438 1438
1439 sign_place(&id, group, sign_name, buf, lnum, prio); 1439 sign_place(&id, group, sign_name, buf, lnum, prio);
1440 } 1440 }
1451 int id, 1451 int id,
1452 char_u *group) 1452 char_u *group)
1453 { 1453 {
1454 if (lnum >= 0 || sign_name != NULL || (group != NULL && *group == '\0')) 1454 if (lnum >= 0 || sign_name != NULL || (group != NULL && *group == '\0'))
1455 { 1455 {
1456 emsg(_(e_invarg)); 1456 emsg(_(e_invalid_argument));
1457 return; 1457 return;
1458 } 1458 }
1459 1459
1460 if (id == -2) 1460 if (id == -2)
1461 { 1461 {
1520 int id, 1520 int id,
1521 char_u *group) 1521 char_u *group)
1522 { 1522 {
1523 if (sign_name == NULL && group == NULL && id == -1) 1523 if (sign_name == NULL && group == NULL && id == -1)
1524 { 1524 {
1525 emsg(_(e_argreq)); 1525 emsg(_(e_argument_required));
1526 return; 1526 return;
1527 } 1527 }
1528 1528
1529 if (buf == NULL || (group != NULL && *group == '\0') 1529 if (buf == NULL || (group != NULL && *group == '\0')
1530 || lnum >= 0 || sign_name != NULL) 1530 || lnum >= 0 || sign_name != NULL)
1531 { 1531 {
1532 // File or buffer is not specified or an empty group is used 1532 // File or buffer is not specified or an empty group is used
1533 // or a line number or a sign name is specified. 1533 // or a line number or a sign name is specified.
1534 emsg(_(e_invarg)); 1534 emsg(_(e_invalid_argument));
1535 return; 1535 return;
1536 } 1536 }
1537 (void)sign_jump(id, group, buf); 1537 (void)sign_jump(id, group, buf);
1538 } 1538 }
1539 1539
1584 } 1584 }
1585 else if (STRNCMP(arg, "*", 1) == 0 && cmd == SIGNCMD_UNPLACE) 1585 else if (STRNCMP(arg, "*", 1) == 0 && cmd == SIGNCMD_UNPLACE)
1586 { 1586 {
1587 if (*signid != -1) 1587 if (*signid != -1)
1588 { 1588 {
1589 emsg(_(e_invarg)); 1589 emsg(_(e_invalid_argument));
1590 return FAIL; 1590 return FAIL;
1591 } 1591 }
1592 *signid = -2; 1592 *signid = -2;
1593 arg = skiptowhite(arg + 1); 1593 arg = skiptowhite(arg + 1);
1594 } 1594 }
1633 semsg(_(e_trailing_arg), arg); 1633 semsg(_(e_trailing_arg), arg);
1634 break; 1634 break;
1635 } 1635 }
1636 else 1636 else
1637 { 1637 {
1638 emsg(_(e_invarg)); 1638 emsg(_(e_invalid_argument));
1639 return FAIL; 1639 return FAIL;
1640 } 1640 }
1641 arg = skipwhite(arg); 1641 arg = skipwhite(arg);
1642 } 1642 }
1643 1643
2469 sign_id = (int)tv_get_number_chk(&argvars[0], &notanum); 2469 sign_id = (int)tv_get_number_chk(&argvars[0], &notanum);
2470 if (notanum) 2470 if (notanum)
2471 return; 2471 return;
2472 if (sign_id <= 0) 2472 if (sign_id <= 0)
2473 { 2473 {
2474 emsg(_(e_invarg)); 2474 emsg(_(e_invalid_argument));
2475 return; 2475 return;
2476 } 2476 }
2477 2477
2478 // Sign group 2478 // Sign group
2479 sign_group = tv_get_string_chk(&argvars[1]); 2479 sign_group = tv_get_string_chk(&argvars[1]);
2535 sign_id = tv_get_number_chk(id_tv, &notanum); 2535 sign_id = tv_get_number_chk(id_tv, &notanum);
2536 if (notanum) 2536 if (notanum)
2537 return -1; 2537 return -1;
2538 if (sign_id < 0) 2538 if (sign_id < 0)
2539 { 2539 {
2540 emsg(_(e_invarg)); 2540 emsg(_(e_invalid_argument));
2541 return -1; 2541 return -1;
2542 } 2542 }
2543 } 2543 }
2544 2544
2545 // sign group 2545 // sign group
2597 if (di != NULL) 2597 if (di != NULL)
2598 { 2598 {
2599 lnum = tv_get_lnum(&di->di_tv); 2599 lnum = tv_get_lnum(&di->di_tv);
2600 if (lnum <= 0) 2600 if (lnum <= 0)
2601 { 2601 {
2602 emsg(_(e_invarg)); 2602 emsg(_(e_invalid_argument));
2603 goto cleanup; 2603 goto cleanup;
2604 } 2604 }
2605 } 2605 }
2606 2606
2607 // sign priority 2607 // sign priority
2789 if (dict_find(dict, (char_u *)"id", -1) != NULL) 2789 if (dict_find(dict, (char_u *)"id", -1) != NULL)
2790 { 2790 {
2791 sign_id = dict_get_number(dict, (char_u *)"id"); 2791 sign_id = dict_get_number(dict, (char_u *)"id");
2792 if (sign_id <= 0) 2792 if (sign_id <= 0)
2793 { 2793 {
2794 emsg(_(e_invarg)); 2794 emsg(_(e_invalid_argument));
2795 goto cleanup; 2795 goto cleanup;
2796 } 2796 }
2797 } 2797 }
2798 } 2798 }
2799 2799
2864 || check_for_opt_dict_arg(argvars, 1) == FAIL)) 2864 || check_for_opt_dict_arg(argvars, 1) == FAIL))
2865 return; 2865 return;
2866 2866
2867 if (argvars[0].v_type != VAR_STRING) 2867 if (argvars[0].v_type != VAR_STRING)
2868 { 2868 {
2869 emsg(_(e_invarg)); 2869 emsg(_(e_invalid_argument));
2870 return; 2870 return;
2871 } 2871 }
2872 2872
2873 if (argvars[1].v_type != VAR_UNKNOWN) 2873 if (argvars[1].v_type != VAR_UNKNOWN)
2874 { 2874 {