vim: src/ex_getln.c comparison

comparison src/ex_getln.c @ 4258:9945fe0536a3 v7.3.880

updated for version 7.3.880 Problem: When writing viminfo, old history lines may replace lines written more recently by another Vim instance. Solution: Mark history entries that were read from viminfo and overwrite them when merging with the current viminfo.

author	Bram Moolenaar <bram@vim.org>
date	Fri, 05 Apr 2013 18:58:47 +0200
parents	edd0bc1f26bd
children	76aa34cef80f

comparison

equal deleted inserted replaced

-:2ffb43ae7849
+:9945fe0536a3
 #ifdef FEAT_CMDHIST
 typedef struct hist_entry
 {
 int		hisnum;		/* identifying number */
+int		viminfo;	/* when TRUE hisstr comes from viminfo */
 char_u	*hisstr;	/* actual entry, separator char after the NUL */
 } histentry_T;
 static histentry_T *(history[HIST_COUNT]) = {NULL, NULL, NULL, NULL, NULL};
 static int	hisidx[HIST_COUNT] = {-1, -1, -1, -1, -1};  /* lastused entry */
 #ifdef FEAT_CMDL_COMPL
 static int	expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg));
 static int	ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[]));
 # ifdef FEAT_CMDHIST
 static char_u	*get_history_arg __ARGS((expand_T *xp, int idx));
+static void	clear_hist_entry __ARGS((histentry_T *hisptr));
 # endif
 # if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
 static int	ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file));
 static int	ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file));
 # endif
 	    if (newlen == 0 || temp != NULL)
 	    {
 		if (hisidx[type] < 0)		/* there are no entries yet */
 		{
 		    for (i = 0; i < newlen; ++i)
-		    {
+			clear_hist_entry(&temp[i]);
-			temp[i].hisnum = 0;
-			temp[i].hisstr = NULL;
-		    }
 		}
 		else if (newlen > hislen)	/* array becomes bigger */
 		{
 		    for (i = 0; i <= hisidx[type]; ++i)
 			temp[i] = history[type][i];
 		    j = i;
 		    for ( ; i <= newlen - (hislen - hisidx[type]); ++i)
-		    {
+			clear_hist_entry(&temp[i]);
-			temp[i].hisnum = 0;
-			temp[i].hisstr = NULL;
-		    }
 		    for ( ; j < hislen; ++i, ++j)
 			temp[i] = history[type][j];
 		}
 		else				/* array becomes smaller or 0 */
 		{
 	}
 	hislen = newlen;
 }
 }
+static void
+clear_hist_entry(hisptr)
+histentry_T	*hisptr;
+{
+hisptr->hisnum = 0;
+hisptr->viminfo = FALSE;
+hisptr->hisstr = NULL;
+}
 /*
 * Check if command line 'str' is already in history.
 * If 'move_to_front' is TRUE, matching entry is moved to end of history.
 */
 static int
 	    if (++i >= hislen)
 		i = 0;
 	    history[type][last_i] = history[type][i];
 	    last_i = i;
 	}
+	history[type][i].hisnum = ++hisnum[type];
+	history[type][i].viminfo = FALSE;
 	history[type][i].hisstr = str;
-	history[type][i].hisnum = ++hisnum[type];
 	return TRUE;
 }
 return FALSE;
 }
 	if (maptick == last_maptick)
 	{
 	    /* Current line is from the same mapping, remove it */
 	    hisptr = &history[HIST_SEARCH][hisidx[HIST_SEARCH]];
 	    vim_free(hisptr->hisstr);
-	    hisptr->hisstr = NULL;
+	    clear_hist_entry(hisptr);
-	    hisptr->hisnum = 0;
 	    --hisnum[histype];
 	    if (--hisidx[HIST_SEARCH] < 0)
 		hisidx[HIST_SEARCH] = hislen - 1;
 	}
 	last_maptick = -1;
 	hisptr->hisstr = vim_strnsave(new_entry, len + 2);
 	if (hisptr->hisstr != NULL)
 	    hisptr->hisstr[len + 1] = sep;
 	hisptr->hisnum = ++hisnum[histype];
+	hisptr->viminfo = FALSE;
 	if (histype == HIST_SEARCH && in_map)
 	    last_maptick = maptick;
 }
 }
 {
 	hisptr = history[histype];
 	for (i = hislen; i--;)
 	{
 	    vim_free(hisptr->hisstr);
-	    hisptr->hisnum = 0;
+	    clear_hist_entry(hisptr);
-	    hisptr++->hisstr = NULL;
 	}
 	hisidx[histype] = -1;	/* mark history as cleared */
 	hisnum[histype] = 0;	/* reset identifier counter */
 	return OK;
 }
 		break;
 	    if (vim_regexec(&regmatch, hisptr->hisstr, (colnr_T)0))
 	    {
 		found = TRUE;
 		vim_free(hisptr->hisstr);
-		hisptr->hisstr = NULL;
+		clear_hist_entry(hisptr);
-		hisptr->hisnum = 0;
 	    }
 	    else
 	    {
 		if (i != last)
 		{
 		    history[histype][last] = *hisptr;
-		    hisptr->hisstr = NULL;
+		    clear_hist_entry(hisptr);
-		    hisptr->hisnum = 0;
 		}
 		if (--last < 0)
 		    last += hislen;
 	    }
 	    if (--i < 0)
 {
 	j = (i + 1) % hislen;
 	history[histype][i] = history[histype][j];
 	i = j;
 }
-history[histype][i].hisstr = NULL;
+clear_hist_entry(&history[histype][i]);
-history[histype][i].hisnum = 0;
 if (--i < 0)
 	i += hislen;
 hisidx[histype] = i;
 return TRUE;
 }
 if (asklen > hislen)
 	asklen = hislen;
 for (type = 0; type < HIST_COUNT; ++type)
 {
-	/*
+	/* Count the number of empty spaces in the history list.  Entries read
-	 * Count the number of empty spaces in the history list.  If there are
+	 * from viminfo previously are also considered empty.  If there are
-	 * more spaces available than we request, then fill them up.
+	 * more spaces available than we request, then fill them up. */
-	 */
 	for (i = 0, num = 0; i < hislen; i++)
-	    if (history[type][i].hisstr == NULL)
+	    if (history[type][i].hisstr == NULL || history[type][i].viminfo)
 		num++;
 	len = asklen;
 	if (num > len)
 	    len = num;
 	if (len <= 0)
 	{
 	    if (hisidx[type] == -1)
 		hisidx[type] = hislen - 1;
 	    do
 	    {
-		if (history[type][idx].hisstr != NULL)
+		if (history[type][idx].hisstr != NULL
+						|| history[type][idx].viminfo)
 		    break;
 		if (++idx == hislen)
 		    idx = 0;
 	    } while (idx != hisidx[type]);
 	    if (idx != hisidx[type] && --idx < 0)
 	}
 	for (i = 0; i < viminfo_hisidx[type]; i++)
 	{
 	    vim_free(history[type][idx].hisstr);
 	    history[type][idx].hisstr = viminfo_history[type][i];
+	    history[type][idx].viminfo = TRUE;
 	    if (--idx < 0)
 		idx = hislen - 1;
 	}
 	idx += 1;
 	idx %= hislen;

Mercurial > vim

comparison src/ex_getln.c @ 4258:9945fe0536a3 v7.3.880