comparison src/ex_eval.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 ef00b6bc186b
comparison
equal deleted inserted replaced
15542:5baedae7ca7a 15543:dd725a8ab112
554 ++no_wait_return; 554 ++no_wait_return;
555 if (debug_break_level > 0 || *p_vfile == NUL) 555 if (debug_break_level > 0 || *p_vfile == NUL)
556 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 556 msg_scroll = TRUE; /* always scroll up, don't overwrite */
557 557
558 smsg(_("Exception thrown: %s"), excp->value); 558 smsg(_("Exception thrown: %s"), excp->value);
559 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 559 msg_puts("\n"); /* don't overwrite this either */
560 560
561 if (debug_break_level > 0 || *p_vfile == NUL) 561 if (debug_break_level > 0 || *p_vfile == NUL)
562 cmdline_row = msg_row; 562 cmdline_row = msg_row;
563 --no_wait_return; 563 --no_wait_return;
564 if (debug_break_level > 0) 564 if (debug_break_level > 0)
608 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 608 msg_scroll = TRUE; /* always scroll up, don't overwrite */
609 smsg(was_finished 609 smsg(was_finished
610 ? _("Exception finished: %s") 610 ? _("Exception finished: %s")
611 : _("Exception discarded: %s"), 611 : _("Exception discarded: %s"),
612 excp->value); 612 excp->value);
613 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 613 msg_puts("\n"); /* don't overwrite this either */
614 if (debug_break_level > 0 || *p_vfile == NUL) 614 if (debug_break_level > 0 || *p_vfile == NUL)
615 cmdline_row = msg_row; 615 cmdline_row = msg_row;
616 --no_wait_return; 616 --no_wait_return;
617 if (debug_break_level > 0) 617 if (debug_break_level > 0)
618 msg_silent = save_msg_silent; 618 msg_silent = save_msg_silent;
677 ++no_wait_return; 677 ++no_wait_return;
678 if (debug_break_level > 0 || *p_vfile == NUL) 678 if (debug_break_level > 0 || *p_vfile == NUL)
679 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 679 msg_scroll = TRUE; /* always scroll up, don't overwrite */
680 680
681 smsg(_("Exception caught: %s"), excp->value); 681 smsg(_("Exception caught: %s"), excp->value);
682 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 682 msg_puts("\n"); /* don't overwrite this either */
683 683
684 if (debug_break_level > 0 || *p_vfile == NUL) 684 if (debug_break_level > 0 || *p_vfile == NUL)
685 cmdline_row = msg_row; 685 cmdline_row = msg_row;
686 --no_wait_return; 686 --no_wait_return;
687 if (debug_break_level > 0) 687 if (debug_break_level > 0)
804 if (debug_break_level > 0) 804 if (debug_break_level > 0)
805 msg_silent = FALSE; /* display messages */ 805 msg_silent = FALSE; /* display messages */
806 ++no_wait_return; 806 ++no_wait_return;
807 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 807 msg_scroll = TRUE; /* always scroll up, don't overwrite */
808 smsg(mesg, s); 808 smsg(mesg, s);
809 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 809 msg_puts("\n"); /* don't overwrite this either */
810 cmdline_row = msg_row; 810 cmdline_row = msg_row;
811 --no_wait_return; 811 --no_wait_return;
812 if (debug_break_level > 0) 812 if (debug_break_level > 0)
813 msg_silent = save_msg_silent; 813 msg_silent = save_msg_silent;
814 814