# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1452888007 -3600
# Node ID 99e93f72ff91224be7b0e2cca19b86efbf99cf18
# Parent  1ac8a3077973209572a5d8b7dd3316b8530354f5
commit https://github.com/vim/vim/commit/065ee9aebf9abe08ae8c0dba7d05cbdcc423c8e0
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jan 15 20:53:38 2016 +0100

    patch 7.4.1097
    Problem:    Looking up the alloc ID for tests fails.
    Solution:   Fix the line computation.  Use assert_fails() for unlet test.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -48,14 +48,16 @@ let s:srcdir = expand('%:p:h:h')
 " Support function: get the alloc ID by name.
 function GetAllocId(name)
   exe 'split ' . s:srcdir . '/alloc.h'
-  /typedef enum/
-  let top = getline('.')
+  let top = search('typedef enum')
+  if top == 0
+    call add(v:errors, 'typedef not found in alloc.h')
+  endif
   let lnum = search('aid_' . a:name . ',')
   if lnum == 0
     call add(v:errors, 'Alloc ID ' . a:name . ' not defined')
   endif
   close
-  return lnum - top
+  return lnum - top - 1
 endfunc
 
 
diff --git a/src/testdir/test_unlet.vim b/src/testdir/test_unlet.vim
--- a/src/testdir/test_unlet.vim
+++ b/src/testdir/test_unlet.vim
@@ -1,18 +1,9 @@
 " Tests for :unlet
 
 func Test_read_only()
-  try
-    " this caused a crash
-    unlet count
-  catch
-    call assert_true(v:exception =~ ':E795:')
-  endtry
-  try
-    " this caused a crash
-    unlet errmsg
-  catch
-    call assert_true(v:exception =~ ':E795:')
-  endtry
+  " these caused a crash
+  call assert_fails('unlet count', 'E795:')
+  call assert_fails('unlet errmsg', 'E795:')
 endfunc
 
 func Test_existing()
@@ -24,9 +15,5 @@ endfunc
 
 func Test_not_existing()
   unlet! does_not_exist
-  try
-    unlet does_not_exist
-  catch
-    call assert_true(v:exception =~ ':E108:')
-  endtry
+  call assert_fails('unlet does_not_exist', 'E108:')
 endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1097,
+/**/
     1096,
 /**/
     1095,