Mercurial > vim
comparison src/eval.c @ 3508:02440d1fcc9a v7.3.516
updated for version 7.3.516
Problem: extend(o, o) may crash Vim.
Solution: Fix crash and add test. (Thinca and Hirohito Higashi)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Fri, 18 May 2012 12:07:05 +0200 |
parents | 454646820185 |
children | e4899d2ff5d8 |
comparison
equal
deleted
inserted
replaced
3507:8201108e9cf0 | 3508:02440d1fcc9a |
---|---|
10189 else if (*action == 'e') | 10189 else if (*action == 'e') |
10190 { | 10190 { |
10191 EMSG2(_("E737: Key already exists: %s"), hi2->hi_key); | 10191 EMSG2(_("E737: Key already exists: %s"), hi2->hi_key); |
10192 break; | 10192 break; |
10193 } | 10193 } |
10194 else if (*action == 'f') | 10194 else if (*action == 'f' && HI2DI(hi2) != di1) |
10195 { | 10195 { |
10196 clear_tv(&di1->di_tv); | 10196 clear_tv(&di1->di_tv); |
10197 copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv); | 10197 copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv); |
10198 } | 10198 } |
10199 } | 10199 } |