mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8967 'vim-patch:8.0.1781'

Browse Source
This commit is contained in:
Justin M. Keyes
2018-09-10 09:24:16 +02:00
parent bbbed9fc66 0c80fead86
commit d9fcd43638
3 changed files with 73 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/quickfix.c
View File

@@ -2240,8 +2240,12 @@ void qf_list(exarg_T *eap)
}
}
if (qi->qf_lists[qi->qf_curlist].qf_nonevalid)
all = TRUE;
// Shorten all the file names, so that it is easy to read.
shorten_fnames(false);
if (qi->qf_lists[qi->qf_curlist].qf_nonevalid) {
all = true;
}
qfp = qi->qf_lists[qi->qf_curlist].qf_start;
for (i = 1; !got_int && i <= qi->qf_lists[qi->qf_curlist].qf_count; ) {
if ((qfp->qf_valid || all) && idx1 <= i && i <= idx2) {
@@ -2944,6 +2948,10 @@ static void qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last)
/* Check if there is anything to display */
if (qi->qf_curlist < qi->qf_listcount) {
char_u dirname[MAXPATHL];
*dirname = NUL;
// Add one line for each error
if (old_last == NULL) {
qfp = qi->qf_lists[qi->qf_curlist].qf_start;
@@ -2959,6 +2967,14 @@ static void qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last)
if (qfp->qf_type == 1) { // :helpgrep
STRLCPY(IObuff, path_tail(errbuf->b_fname), sizeof(IObuff));
} else {
// shorten the file name if not done already
if (errbuf->b_sfname == NULL
|| path_is_absolute(errbuf->b_sfname)) {
if (*dirname == NUL) {
os_dirname(dirname, MAXPATHL);
}
shorten_buf_fname(errbuf, dirname, false);
}
STRLCPY(IObuff, errbuf->b_fname, sizeof(IObuff));
}
len = (int)STRLEN(IObuff);