Sorry, Bram - I still encounter a number of crashes related to viminfo merge.
Here is my patch (which solves the different problems I've encountered so far).
Best regards,
Ron
Index: src/ex_getln.c
==================================================================
--- src/ex_getln.c
+++ src/ex_getln.c
@@ -6228,11 +6228,11 @@
if (i >= 0)
while (num_saved > 0
&& !(round == 2 && i >= viminfo_hisidx[type]))
{
p = round == 1 ? history[type][i].hisstr
- : viminfo_history[type][i];
+ : (viminfo_history[type] ?
viminfo_history[type][i] : NULL);
if (p != NULL && (round == 2 || !history[type][i].viminfo))
{
--num_saved;
fputc(hist_type2char(type, TRUE), fp);
/* For the search history: put the separator in the
@@ -6259,11 +6259,12 @@
++i;
}
}
}
for (i = 0; i < viminfo_hisidx[type]; ++i)
- vim_free(viminfo_history[type][i]);
+ if (viminfo_history[type])
+ vim_free(viminfo_history[type][i]);
vim_free(viminfo_history[type]);
viminfo_history[type] = NULL;
viminfo_hisidx[type] = 0;
}
}
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
