Mercurial > vim

comparison src/eval.c @ 15482:18dd04f7c4a1 v8.1.0749

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0749: error message contains garbage commit https://github.com/vim/vim/commit/6acc79f5d4b9d5b02f4ab21ec885e68acc13a2e2 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jan 14 22:53:31 2019 +0100 patch 8.1.0749: error message contains garbage Problem: Error message contains garbage. (Dominique Pelle) Solution: Use correct pointer to failed expression.
author Bram Moolenaar <Bram@vim.org>
date Mon, 14 Jan 2019 23:00:06 +0100
parents 051937ebaf22
children 98c35d312987
comparison
equal deleted inserted replaced
15481:fff354cd6a96 15482:18dd04f7c4a1
700 * Call eval1() and give an error message if not done at a lower level. 700 * Call eval1() and give an error message if not done at a lower level.
701 */ 701 */
702 static int 702 static int
703 eval1_emsg(char_u **arg, typval_T *rettv, int evaluate) 703 eval1_emsg(char_u **arg, typval_T *rettv, int evaluate)
704 { 704 {
705 char_u *start = *arg;
705 int ret; 706 int ret;
706 int did_emsg_before = did_emsg; 707 int did_emsg_before = did_emsg;
707 int called_emsg_before = called_emsg; 708 int called_emsg_before = called_emsg;
708 709
709 ret = eval1(arg, rettv, evaluate); 710 ret = eval1(arg, rettv, evaluate);
713 // been cancelled due to an aborting error, an interrupt, or an 714 // been cancelled due to an aborting error, an interrupt, or an
714 // exception, or we already gave a more specific error. 715 // exception, or we already gave a more specific error.
715 // Also check called_emsg for when using assert_fails(). 716 // Also check called_emsg for when using assert_fails().
716 if (!aborting() && did_emsg == did_emsg_before 717 if (!aborting() && did_emsg == did_emsg_before
717 && called_emsg == called_emsg_before) 718 && called_emsg == called_emsg_before)
718 semsg(_(e_invexpr2), arg); 719 semsg(_(e_invexpr2), start);
719 } 720 }
720 return ret; 721 return ret;
721 } 722 }
722 723
723 static int 724 static int