aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 7.4.864

Browse Source 
Problem:    Tiny build fails.
Solution:   Put qf_ items inside #ifdef.
This commit is contained in:
Bram Moolenaar
2015-09-09 21:10:39 +02:00
parent 43335ea394
commit e906c50207
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ex_docmd.c
View File

@@ -2173,9 +2173,11 @@ do_one_cmd(cmdlinep, sourcing,
lnum = CURRENT_TAB_NR; lnum = CURRENT_TAB_NR;
ea.line2 = lnum; ea.line2 = lnum;
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
ea.line2 = qf_get_cur_valid_idx(&ea); ea.line2 = qf_get_cur_valid_idx(&ea);
break; break;
#endif
} }
ea.cmd = skipwhite(ea.cmd); ea.cmd = skipwhite(ea.cmd);
lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0); lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0);
@@ -2236,12 +2238,14 @@ do_one_cmd(cmdlinep, sourcing,
ea.line2 = ARGCOUNT; ea.line2 = ARGCOUNT;
} }
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
ea.line1 = 1; ea.line1 = 1;
ea.line2 = qf_get_size(&ea); ea.line2 = qf_get_size(&ea);
if (ea.line2 == 0) if (ea.line2 == 0)
ea.line2 = 1; ea.line2 = 1;
break; break;
#endif
} }
++ea.addr_count; ++ea.addr_count;
} }
@@ -2702,11 +2706,13 @@ do_one_cmd(cmdlinep, sourcing,
else else
ea.line2 = ARGCOUNT; ea.line2 = ARGCOUNT;
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
ea.line2 = qf_get_size(&ea); ea.line2 = qf_get_size(&ea);
if (ea.line2 == 0) if (ea.line2 == 0)
ea.line2 = 1; ea.line2 = 1;
break; break;
#endif
} }
} }
@@ -4340,7 +4346,7 @@ skip_range(cmd, ctx)
*/ */
static linenr_T static linenr_T
get_address(eap, ptr, addr_type, skip, to_other_file) get_address(eap, ptr, addr_type, skip, to_other_file)
exarg_T *eap; exarg_T *eap UNUSED;
char_u **ptr; char_u **ptr;
int addr_type; /* flag: one of ADDR_LINES, ... */ int addr_type; /* flag: one of ADDR_LINES, ... */
int skip; /* only skip the address, don't use it */ int skip; /* only skip the address, don't use it */
@@ -4381,9 +4387,11 @@ get_address(eap, ptr, addr_type, skip, to_other_file)
case ADDR_TABS: case ADDR_TABS:
lnum = CURRENT_TAB_NR; lnum = CURRENT_TAB_NR;
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
lnum = qf_get_cur_valid_idx(eap); lnum = qf_get_cur_valid_idx(eap);
break; break;
#endif
} }
break; break;
@@ -4416,11 +4424,13 @@ get_address(eap, ptr, addr_type, skip, to_other_file)
case ADDR_TABS: case ADDR_TABS:
lnum = LAST_TAB_NR; lnum = LAST_TAB_NR;
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
lnum = qf_get_size(eap); lnum = qf_get_size(eap);
if (lnum == 0) if (lnum == 0)
lnum = 1; lnum = 1;
break; break;
#endif
} }
break; break;
@@ -4596,9 +4606,11 @@ get_address(eap, ptr, addr_type, skip, to_other_file)
case ADDR_TABS: case ADDR_TABS:
lnum = CURRENT_TAB_NR; lnum = CURRENT_TAB_NR;
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
lnum = qf_get_cur_valid_idx(eap); lnum = qf_get_cur_valid_idx(eap);
break; break;
#endif
} }
} }
@@ -4737,10 +4749,12 @@ invalid_range(eap)
if (eap->line2 > LAST_TAB_NR) if (eap->line2 > LAST_TAB_NR)
return (char_u *)_(e_invrange); return (char_u *)_(e_invrange);
break; break;
#ifdef FEAT_QUICKFIX
case ADDR_QUICKFIX: case ADDR_QUICKFIX:
if (eap->line2 != 1 && eap->line2 > qf_get_size(eap)) if (eap->line2 != 1 && eap->line2 > qf_get_size(eap))
return (char_u *)_(e_invrange); return (char_u *)_(e_invrange);
break; break;
#endif
} }
} }
return NULL; return NULL;

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
864,
/**/ /**/
863, 863,
/**/ /**/