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

patch 8.1.2225: the "last used" info of a buffer is under used

Browse Source 
Problem:    The "last used" info of a buffer is under used.
Solution:   Add "lastused" to getbufinfo(). List buffers sorted by last-used
            field. (Andi Massimino, closes #4722)
This commit is contained in:
Bram Moolenaar
2019-10-27 05:12:45 +01:00
parent dfded98f87
commit 52410575be
18 changed files with 228 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/buffer.c
View File

@@ -2601,6 +2601,13 @@ buflist_findpat(
return match;
}
#ifdef FEAT_VIMINFO
typedef struct {
buf_T *buf;
char_u *match;
} bufmatch_T;
#endif
/*
* Find all buffer names that match.
* For command line expansion of ":buf" and ":sbuf".
@@ -2619,6 +2626,9 @@ ExpandBufnames(
char_u *p;
int attempt;
char_u *patc;
#ifdef FEAT_VIMINFO
bufmatch_T *matches = NULL;
#endif
*num_file = 0; /* return values in case of FAIL */
*file = NULL;
@@ -2675,7 +2685,16 @@ ExpandBufnames(
p = home_replace_save(buf, p);
else
p = vim_strsave(p);
(*file)[count++] = p;
#ifdef FEAT_VIMINFO
if (matches != NULL)
{
matches[count].buf = buf;
matches[count].match = p;
count++;
}
else
#endif
(*file)[count++] = p;
}
}
}
@@ -2691,6 +2710,10 @@ ExpandBufnames(
vim_free(patc);
return FAIL;
}
#ifdef FEAT_VIMINFO
if (options & WILD_BUFLASTUSED)
matches = ALLOC_MULT(bufmatch_T, count);
#endif
}
}
vim_regfree(regmatch.regprog);
@@ -2701,6 +2724,28 @@ ExpandBufnames(
if (patc != pat)
vim_free(patc);
#ifdef FEAT_VIMINFO
if (matches != NULL)
{
int i;
if (count > 1)
qsort(matches, count, sizeof(bufmatch_T), buf_compare);
// if the current buffer is first in the list, place it at the end
if (matches[0].buf == curbuf)
{
for (i = 1; i < count; i++)
(*file)[i-1] = matches[i].match;
(*file)[count-1] = matches[0].match;
}
else
{
for (i = 0; i < count; i++)
(*file)[i] = matches[i].match;
}
vim_free(matches);
}
#endif
*num_file = count;
return (count == 0 ? FAIL : OK);
}
@@ -3016,7 +3061,7 @@ buflist_findlnum(buf_T *buf)
void
buflist_list(exarg_T *eap)
{
buf_T *buf;
buf_T *buf = firstbuf;
int len;
int i;
int ro_char;
@@ -3026,7 +3071,32 @@ buflist_list(exarg_T *eap)
int job_none_open;
#endif
#ifdef FEAT_VIMINFO
garray_T buflist;
buf_T **buflist_data = NULL, **p;
if (vim_strchr(eap->arg, 't'))
{
ga_init2(&buflist, sizeof(buf_T *), 50);
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
{
if (ga_grow(&buflist, 1) == OK)
((buf_T **)buflist.ga_data)[buflist.ga_len++] = buf;
}
qsort(buflist.ga_data, (size_t)buflist.ga_len,
sizeof(buf_T *), buf_compare);
p = buflist_data = (buf_T **)buflist.ga_data;
buf = *p;
}
for (; buf != NULL && !got_int; buf = buflist_data
? (++p < buflist_data + buflist.ga_len ? *p : NULL)
: buf->b_next)
#else
for (buf = firstbuf; buf != NULL && !got_int; buf = buf->b_next)
#endif
{
#ifdef FEAT_TERMINAL
job_running = term_job_running(buf->b_term);
@@ -3100,13 +3170,23 @@ buflist_list(exarg_T *eap)
do
IObuff[len++] = ' ';
while (--i > 0 && len < IOSIZE - 18);
vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),
_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum
#ifdef FEAT_VIMINFO
if (vim_strchr(eap->arg, 't') && buf->b_last_used)
add_time(IObuff + len, (size_t)(IOSIZE - len), buf->b_last_used);
else
#endif
vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),
_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum
: (long)buflist_findlnum(buf));
msg_outtrans(IObuff);
out_flush(); /* output one line at a time */
ui_breakcheck();
}
#ifdef FEAT_VIMINFO
if (buflist_data)
ga_clear(&buflist);
#endif
}
/*