comparison src/mark.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 6f1c7e9a6393
comparison
equal deleted inserted replaced
15542:5baedae7ca7a 15543:dd725a8ab112
759 if (did_title) 759 if (did_title)
760 did_title = FALSE; 760 did_title = FALSE;
761 else 761 else
762 { 762 {
763 if (arg == NULL) 763 if (arg == NULL)
764 MSG(_("No marks set")); 764 msg(_("No marks set"));
765 else 765 else
766 semsg(_("E283: No marks matching \"%s\""), arg); 766 semsg(_("E283: No marks matching \"%s\""), arg);
767 } 767 }
768 } 768 }
769 /* don't output anything if 'q' typed at --more-- prompt */ 769 /* don't output anything if 'q' typed at --more-- prompt */
772 && p->lnum != 0) 772 && p->lnum != 0)
773 { 773 {
774 if (!did_title) 774 if (!did_title)
775 { 775 {
776 /* Highlight title */ 776 /* Highlight title */
777 MSG_PUTS_TITLE(_("\nmark line col file/text")); 777 msg_puts_title(_("\nmark line col file/text"));
778 did_title = TRUE; 778 did_title = TRUE;
779 } 779 }
780 msg_putchar('\n'); 780 msg_putchar('\n');
781 if (!got_int) 781 if (!got_int)
782 { 782 {
893 char_u *name; 893 char_u *name;
894 894
895 cleanup_jumplist(curwin, TRUE); 895 cleanup_jumplist(curwin, TRUE);
896 896
897 /* Highlight title */ 897 /* Highlight title */
898 MSG_PUTS_TITLE(_("\n jump line col file/text")); 898 msg_puts_title(_("\n jump line col file/text"));
899 for (i = 0; i < curwin->w_jumplistlen && !got_int; ++i) 899 for (i = 0; i < curwin->w_jumplistlen && !got_int; ++i)
900 { 900 {
901 if (curwin->w_jumplist[i].fmark.mark.lnum != 0) 901 if (curwin->w_jumplist[i].fmark.mark.lnum != 0)
902 { 902 {
903 name = fm_getname(&curwin->w_jumplist[i].fmark, 16); 903 name = fm_getname(&curwin->w_jumplist[i].fmark, 16);
926 ui_breakcheck(); 926 ui_breakcheck();
927 } 927 }
928 out_flush(); 928 out_flush();
929 } 929 }
930 if (curwin->w_jumplistidx == curwin->w_jumplistlen) 930 if (curwin->w_jumplistidx == curwin->w_jumplistlen)
931 MSG_PUTS("\n>"); 931 msg_puts("\n>");
932 } 932 }
933 933
934 void 934 void
935 ex_clearjumps(exarg_T *eap UNUSED) 935 ex_clearjumps(exarg_T *eap UNUSED)
936 { 936 {
947 { 947 {
948 int i; 948 int i;
949 char_u *name; 949 char_u *name;
950 950
951 /* Highlight title */ 951 /* Highlight title */
952 MSG_PUTS_TITLE(_("\nchange line col text")); 952 msg_puts_title(_("\nchange line col text"));
953 953
954 for (i = 0; i < curbuf->b_changelistlen && !got_int; ++i) 954 for (i = 0; i < curbuf->b_changelistlen && !got_int; ++i)
955 { 955 {
956 if (curbuf->b_changelist[i].lnum != 0) 956 if (curbuf->b_changelist[i].lnum != 0)
957 { 957 {
973 ui_breakcheck(); 973 ui_breakcheck();
974 } 974 }
975 out_flush(); 975 out_flush();
976 } 976 }
977 if (curwin->w_changelistidx == curbuf->b_changelistlen) 977 if (curwin->w_changelistidx == curbuf->b_changelistlen)
978 MSG_PUTS("\n>"); 978 msg_puts("\n>");
979 } 979 }
980 #endif 980 #endif
981 981
982 #define one_adjust(add) \ 982 #define one_adjust(add) \
983 { \ 983 { \