mirror of
https://github.com/vim/vim.git
synced 2025-08-31 20:53:42 -04:00
updated for version 7.3.076
Problem: Clang warnings for dead code. Solution: Remove it. (Carlo Teubner)
This commit is contained in:
parent
005c3c27ee
commit
e980d8a934
@ -1798,7 +1798,6 @@ find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
|
||||
char_u *repl_text;
|
||||
gboolean direction_down;
|
||||
SharedFindReplace *sfr;
|
||||
int rc;
|
||||
|
||||
flags = (int)(long)data; /* avoid a lint warning here */
|
||||
|
||||
@ -1824,7 +1823,7 @@ find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
|
||||
|
||||
repl_text = CONVERT_FROM_UTF8(repl_text);
|
||||
find_text = CONVERT_FROM_UTF8(find_text);
|
||||
rc = gui_do_findrepl(flags, find_text, repl_text, direction_down);
|
||||
gui_do_findrepl(flags, find_text, repl_text, direction_down);
|
||||
CONVERT_FROM_UTF8_FREE(repl_text);
|
||||
CONVERT_FROM_UTF8_FREE(find_text);
|
||||
}
|
||||
|
@ -586,9 +586,9 @@ void ex_rubydo(exarg_T *eap)
|
||||
if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
|
||||
return;
|
||||
for (i = eap->line1; i <= eap->line2; i++) {
|
||||
VALUE line, oldline;
|
||||
VALUE line;
|
||||
|
||||
line = oldline = vim_str2rb_enc_str((char *)ml_get(i));
|
||||
line = vim_str2rb_enc_str((char *)ml_get(i));
|
||||
rb_lastline_set(line);
|
||||
eval_enc_string_protect((char *) eap->arg, &state);
|
||||
if (state) {
|
||||
|
@ -200,7 +200,6 @@ coladvance2(pos, addspaces, finetune, wcol)
|
||||
}
|
||||
#endif
|
||||
|
||||
idx = -1;
|
||||
ptr = line;
|
||||
while (col <= wcol && *ptr != NUL)
|
||||
{
|
||||
@ -1223,7 +1222,7 @@ free_all_mem()
|
||||
#endif
|
||||
|
||||
/*
|
||||
* copy a string into newly allocated memory
|
||||
* Copy "string" into newly allocated memory.
|
||||
*/
|
||||
char_u *
|
||||
vim_strsave(string)
|
||||
@ -1239,6 +1238,12 @@ vim_strsave(string)
|
||||
return p;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy up to "len" bytes of "string" into newly allocated memory and
|
||||
* terminate with a NUL.
|
||||
* The allocated memory always has size "len + 1", also when "string" is
|
||||
* shorter.
|
||||
*/
|
||||
char_u *
|
||||
vim_strnsave(string, len)
|
||||
char_u *string;
|
||||
|
@ -960,7 +960,6 @@ nb_free()
|
||||
keyQ_T *key_node = keyHead.next;
|
||||
queue_T *cmd_node = head.next;
|
||||
nbbuf_T buf;
|
||||
buf_T *bufp;
|
||||
int i;
|
||||
|
||||
/* free the netbeans buffer list */
|
||||
@ -969,7 +968,7 @@ nb_free()
|
||||
buf = buf_list[i];
|
||||
vim_free(buf.displayname);
|
||||
vim_free(buf.signmap);
|
||||
if ((bufp=buf.bufp) != NULL)
|
||||
if (buf.bufp != NULL)
|
||||
{
|
||||
buf.bufp->b_netbeans_file = FALSE;
|
||||
buf.bufp->b_was_netbeans_file = FALSE;
|
||||
|
@ -9839,10 +9839,7 @@ spell_iswordp(p, wp)
|
||||
{
|
||||
/* be quick for ASCII */
|
||||
if (wp->w_s->b_spell_ismw[*p])
|
||||
{
|
||||
s = p + 1; /* skip a mid-word character */
|
||||
l = MB_BYTE2LEN(*s);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -9850,10 +9847,7 @@ spell_iswordp(p, wp)
|
||||
if (c < 256 ? wp->w_s->b_spell_ismw[c]
|
||||
: (wp->w_s->b_spell_ismw_mb != NULL
|
||||
&& vim_strchr(wp->w_s->b_spell_ismw_mb, c) != NULL))
|
||||
{
|
||||
s = p + l;
|
||||
l = MB_BYTE2LEN(*s);
|
||||
}
|
||||
}
|
||||
|
||||
c = mb_ptr2char(s);
|
||||
@ -13813,11 +13807,8 @@ add_suggestion(su, gap, goodword, badlenarg, score, altscore, had_bonus,
|
||||
su->su_sfmaxscore = cleanup_suggestions(gap,
|
||||
su->su_sfmaxscore, SUG_CLEAN_COUNT(su));
|
||||
else
|
||||
{
|
||||
i = su->su_maxscore;
|
||||
su->su_maxscore = cleanup_suggestions(gap,
|
||||
su->su_maxscore, SUG_CLEAN_COUNT(su));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -714,6 +714,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
76,
|
||||
/**/
|
||||
75,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user