summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-29 21:14:42 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-29 21:14:42 +0200
commiteee9f65b2a213e9031f172d9d3b22adad6cb985d (patch)
treec1d4d6673d9909cc8f0bac2b924f51bcabdebb51
parent3c610c96389bbb5f0fc83f0a515fc8f1b7f515e4 (diff)
downloadvim-git-8.1.1775.tar.gz
patch 8.1.1775: error message may be empty in filetype testv8.1.1775
Problem: Error message may be empty in filetype test. Solution: Use v:exception instead. (Daniel Hahler, closs #4744)
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8b668c7a2..92a520573 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -521,7 +521,7 @@ func CheckItems(checks)
try
exe 'edit ' . fnameescape(names[i])
catch
- call assert_report('cannot edit "' . names[i] . '": ' . v:errmsg)
+ call assert_report('cannot edit "' . names[i] . '": ' . v:exception)
endtry
if &filetype == '' && &readonly
" File exists but not able to edit it (permission denied)
diff --git a/src/version.c b/src/version.c
index 8a3923ee2..1043275a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1775,
+/**/
1774,
/**/
1773,