vim73-kaoriya-win64-20110722

Author: splhack

CHANGES_kaoriya.txt

@@ -1,3 +1,15 @@
+=== 20110722�̕ύX�_ ===
+  * �x�[�X�R�[�h��7.3.260�ɍX�V���܂���
+  * ����̏����𖞂����ƌ��������ɋL�^����Ȃ��o�O���C��
+    + Google+�̋c�_: http://goo.gl/rxRHZ
+    + vim_dev: http://goo.gl/Yx9Er
+
+=== 20110716�̕ύX�_ ===
+  * �x�[�X�R�[�h��7.3.254�ɍX�V���܂���
+
+=== 20110708�̕ύX�_ ===
+  * �x�[�X�R�[�h��7.3.244�ɍX�V���܂���
+
 === 20110627�̕ύX�_ ===
   * �x�[�X�R�[�h��7.3.237�ɍX�V���܂���
 

src/ex_getln.c

@@ -67,7 +67,7 @@ static int	hislen = 0;		/* actual length of history tables */
 
 static int	hist_char2type __ARGS((int c));
 
-static int	in_history __ARGS((int, char_u *, int));
+static int	in_history __ARGS((int, char_u *, int, int));
 # ifdef FEAT_EVAL
 static int	calc_hist_idx __ARGS((int histype, int num));
 # endif
@@ -5306,10 +5306,11 @@ init_history()
  * If 'move_to_front' is TRUE, matching entry is moved to end of history.
  */
     static int
-in_history(type, str, move_to_front)
+in_history(type, str, move_to_front, sep)
     int	    type;
     char_u  *str;
     int	    move_to_front;	/* Move the entry to the front if it exists */
+    int	    sep;
 {
     int	    i;
     int	    last_i = -1;
@@ -5323,6 +5324,13 @@ in_history(type, str, move_to_front)
 	    return FALSE;
 	if (STRCMP(str, history[type][i].hisstr) == 0)
 	{
+	    char_u *p = history[type][i].hisstr;
+
+	    /* For search history, equation check includes first characters
+	     * equation. */
+	    if (type == HIST_SEARCH && sep != p[STRLEN(p) + 1])
+		break;
+
 	    if (!move_to_front)
 		return TRUE;
 	    last_i = i;
@@ -5415,7 +5423,7 @@ add_to_history(histype, new_entry, in_map, sep)
 	}
 	last_maptick = -1;
     }
-    if (!in_history(histype, new_entry, TRUE))
+    if (!in_history(histype, new_entry, TRUE, sep))
     {
 	if (++hisidx[histype] == hislen)
 	    hisidx[histype] = 0;
@@ -5994,7 +6002,7 @@ read_viminfo_history(virp)
 	if (val != NULL && *val != NUL)
 	{
 	    if (!in_history(type, val + (type == HIST_SEARCH),
-							viminfo_add_at_front))
+			viminfo_add_at_front, *val))
 	    {
 		/* Need to re-allocate to append the separator byte. */
 		len = STRLEN(val);