Merge branch 'vim-with-runtime' into feat/tagfunc
authorMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 13 Jun 2010 17:03:59 +0000 (13 19:03 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 13 Jun 2010 17:03:59 +0000 (13 19:03 +0200)
Conflicts:
src/proto/eval.pro

Caused by 7.2.443

1  2 
src/eval.c
src/option.c
src/proto/eval.pro
src/tag.c

diff --cc src/eval.c
Simple merge
diff --cc src/option.c
Simple merge
@@@ -56,8 -56,7 +56,9 @@@ dictitem_T *dictitem_alloc __ARGS((char
  void dictitem_free __ARGS((dictitem_T *item));
  int dict_add __ARGS((dict_T *d, dictitem_T *item));
  int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
+ dictitem_T *dict_find __ARGS((dict_T *d, char_u *key, int len));
 +void dict_iterate_start __ARGS((typval_T *argvars, struct dict_iterator_S *iter));
 +char_u *dict_iterate_next __ARGS((struct dict_iterator_S *iter, typval_T **tv_result));
  char_u *get_dict_string __ARGS((dict_T *d, char_u *key, int save));
  long get_dict_number __ARGS((dict_T *d, char_u *key));
  char_u *get_function_name __ARGS((expand_T *xp, int idx));
diff --cc src/tag.c
Simple merge