Adding upstream version 2:9.1.0016.upstream/2%9.1.0016

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1528 insertions, 0 deletions

diff --git a/src/mark.c b/src/mark.c
new file mode 100644
index 0000000..22e3c62
--- /dev/null
+++ b/src/mark.c
@@ -0,0 +1,1528 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved	by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+/*
+ * mark.c: functions for setting marks and jumping to them
+ */
+
+#include "vim.h"
+
+/*
+ * This file contains routines to maintain and manipulate marks.
+ */
+
+/*
+ * If a named file mark's lnum is non-zero, it is valid.
+ * If a named file mark's fnum is non-zero, it is for an existing buffer,
+ * otherwise it is from .viminfo and namedfm[n].fname is the file name.
+ * There are marks 'A - 'Z (set by user) and '0 to '9 (set when writing
+ * viminfo).
+ */
+static xfmark_T namedfm[NMARKS + EXTRA_MARKS];		// marks with file nr
+
+static void fname2fnum(xfmark_T *fm);
+static void fmarks_check_one(xfmark_T *fm, char_u *name, buf_T *buf);
+static char_u *mark_line(pos_T *mp, int lead_len);
+static void show_one_mark(int, char_u *, pos_T *, char_u *, int current);
+static void mark_adjust_internal(linenr_T line1, linenr_T line2, long amount,
+    long amount_after, int adjust_folds);
+
+/*
+ * Set named mark "c" at current cursor position.
+ * Returns OK on success, FAIL if bad name given.
+ */
+    int
+setmark(int c)
+{
+    return setmark_pos(c, &curwin->w_cursor, curbuf->b_fnum);
+}
+
+/*
+ * Set named mark "c" to position "pos".
+ * When "c" is upper case use file "fnum".
+ * Returns OK on success, FAIL if bad name given.
+ */
+    int
+setmark_pos(int c, pos_T *pos, int fnum)
+{
+    int		i;
+    buf_T	*buf;
+
+    // Check for a special key (may cause islower() to crash).
+    if (c < 0)
+	return FAIL;
+
+    if (c == '\'' || c == '`')
+    {
+	if (pos == &curwin->w_cursor)
+	{
+	    setpcmark();
+	    // keep it even when the cursor doesn't move
+	    curwin->w_prev_pcmark = curwin->w_pcmark;
+	}
+	else
+	    curwin->w_pcmark = *pos;
+	return OK;
+    }
+
+    buf = buflist_findnr(fnum);
+    if (buf == NULL)
+	return FAIL;
+
+    if (c == '"')
+    {
+	buf->b_last_cursor = *pos;
+	return OK;
+    }
+
+    // Allow setting '[ and '] for an autocommand that simulates reading a
+    // file.
+    if (c == '[')
+    {
+	buf->b_op_start = *pos;
+	return OK;
+    }
+    if (c == ']')
+    {
+	buf->b_op_end = *pos;
+	return OK;
+    }
+
+    if (c == '<' || c == '>')
+    {
+	if (c == '<')
+	    buf->b_visual.vi_start = *pos;
+	else
+	    buf->b_visual.vi_end = *pos;
+	if (buf->b_visual.vi_mode == NUL)
+	    // Visual_mode has not yet been set, use a sane default.
+	    buf->b_visual.vi_mode = 'v';
+	return OK;
+    }
+
+    if (ASCII_ISLOWER(c))
+    {
+	i = c - 'a';
+	buf->b_namedm[i] = *pos;
+	return OK;
+    }
+    if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c))
+    {
+	if (VIM_ISDIGIT(c))
+	    i = c - '0' + NMARKS;
+	else
+	    i = c - 'A';
+	namedfm[i].fmark.mark = *pos;
+	namedfm[i].fmark.fnum = fnum;
+	VIM_CLEAR(namedfm[i].fname);
+#ifdef FEAT_VIMINFO
+	namedfm[i].time_set = vim_time();
+#endif
+	return OK;
+    }
+    return FAIL;
+}
+
+/*
+ * Set the previous context mark to the current position and add it to the
+ * jump list.
+ */
+    void
+setpcmark(void)
+{
+    int		i;
+    xfmark_T	*fm;
+
+    // for :global the mark is set only once
+    if (global_busy || listcmd_busy || (cmdmod.cmod_flags & CMOD_KEEPJUMPS))
+	return;
+
+    curwin->w_prev_pcmark = curwin->w_pcmark;
+    curwin->w_pcmark = curwin->w_cursor;
+
+    if (jop_flags & JOP_STACK)
+    {
+	// jumpoptions=stack: if we're somewhere in the middle of the jumplist
+	// discard everything after the current index.
+	if (curwin->w_jumplistidx < curwin->w_jumplistlen - 1)
+	    // Discard the rest of the jumplist by cutting the length down to
+	    // contain nothing beyond the current index.
+	    curwin->w_jumplistlen = curwin->w_jumplistidx + 1;
+    }
+
+    // If jumplist is full: remove oldest entry
+    if (++curwin->w_jumplistlen > JUMPLISTSIZE)
+    {
+	curwin->w_jumplistlen = JUMPLISTSIZE;
+	vim_free(curwin->w_jumplist[0].fname);
+	for (i = 1; i < JUMPLISTSIZE; ++i)
+	    curwin->w_jumplist[i - 1] = curwin->w_jumplist[i];
+    }
+    curwin->w_jumplistidx = curwin->w_jumplistlen;
+    fm = &curwin->w_jumplist[curwin->w_jumplistlen - 1];
+
+    fm->fmark.mark = curwin->w_pcmark;
+    fm->fmark.fnum = curbuf->b_fnum;
+    fm->fname = NULL;
+#ifdef FEAT_VIMINFO
+    fm->time_set = vim_time();
+#endif
+}
+
+/*
+ * To change context, call setpcmark(), then move the current position to
+ * where ever, then call checkpcmark().  This ensures that the previous
+ * context will only be changed if the cursor moved to a different line.
+ * If pcmark was deleted (with "dG") the previous mark is restored.
+ */
+    void
+checkpcmark(void)
+{
+    if (curwin->w_prev_pcmark.lnum != 0
+	    && (EQUAL_POS(curwin->w_pcmark, curwin->w_cursor)
+		|| curwin->w_pcmark.lnum == 0))
+	curwin->w_pcmark = curwin->w_prev_pcmark;
+    curwin->w_prev_pcmark.lnum = 0;		// it has been checked
+}
+
+/*
+ * move "count" positions in the jump list (count may be negative)
+ */
+    pos_T *
+movemark(int count)
+{
+    pos_T	*pos;
+    xfmark_T	*jmp;
+
+    cleanup_jumplist(curwin, TRUE);
+
+    if (curwin->w_jumplistlen == 0)	    // nothing to jump to
+	return (pos_T *)NULL;
+
+    for (;;)
+    {
+	if (curwin->w_jumplistidx + count < 0
+		|| curwin->w_jumplistidx + count >= curwin->w_jumplistlen)
+	    return (pos_T *)NULL;
+
+	/*
+	 * if first CTRL-O or CTRL-I command after a jump, add cursor position
+	 * to list.  Careful: If there are duplicates (CTRL-O immediately after
+	 * starting Vim on a file), another entry may have been removed.
+	 */
+	if (curwin->w_jumplistidx == curwin->w_jumplistlen)
+	{
+	    setpcmark();
+	    --curwin->w_jumplistidx;	// skip the new entry
+	    if (curwin->w_jumplistidx + count < 0)
+		return (pos_T *)NULL;
+	}
+
+	curwin->w_jumplistidx += count;
+
+	jmp = curwin->w_jumplist + curwin->w_jumplistidx;
+	if (jmp->fmark.fnum == 0)
+	    fname2fnum(jmp);
+	if (jmp->fmark.fnum != curbuf->b_fnum)
+	{
+	    // Make a copy, an autocommand may make "jmp" invalid.
+	    fmark_T fmark = jmp->fmark;
+
+	    // jump to the file with the mark
+	    if (buflist_findnr(fmark.fnum) == NULL)
+	    {					     // Skip this one ..
+		count += count < 0 ? -1 : 1;
+		continue;
+	    }
+	    if (buflist_getfile(fmark.fnum, fmark.mark.lnum, 0, FALSE) == FAIL)
+		return (pos_T *)NULL;
+	    // Set lnum again, autocommands my have changed it
+	    curwin->w_cursor = fmark.mark;
+	    pos = (pos_T *)-1;
+	}
+	else
+	    pos = &(jmp->fmark.mark);
+	return pos;
+    }
+}
+
+/*
+ * Move "count" positions in the changelist (count may be negative).
+ */
+    pos_T *
+movechangelist(int count)
+{
+    int		n;
+
+    if (curbuf->b_changelistlen == 0)	    // nothing to jump to
+	return (pos_T *)NULL;
+
+    n = curwin->w_changelistidx;
+    if (n + count < 0)
+    {
+	if (n == 0)
+	    return (pos_T *)NULL;
+	n = 0;
+    }
+    else if (n + count >= curbuf->b_changelistlen)
+    {
+	if (n == curbuf->b_changelistlen - 1)
+	    return (pos_T *)NULL;
+	n = curbuf->b_changelistlen - 1;
+    }
+    else
+	n += count;
+    curwin->w_changelistidx = n;
+    return curbuf->b_changelist + n;
+}
+
+/*
+ * Find mark "c" in buffer pointed to by "buf".
+ * If "changefile" is TRUE it's allowed to edit another file for '0, 'A, etc.
+ * If "fnum" is not NULL store the fnum there for '0, 'A etc., don't edit
+ * another file.
+ * Returns:
+ * - pointer to pos_T if found.  lnum is 0 when mark not set, -1 when mark is
+ *   in another file which can't be gotten. (caller needs to check lnum!)
+ * - NULL if there is no mark called 'c'.
+ * - -1 if mark is in other file and jumped there (only if changefile is TRUE)
+ */
+    pos_T *
+getmark_buf(buf_T *buf, int c, int changefile)
+{
+    return getmark_buf_fnum(buf, c, changefile, NULL);
+}
+
+    pos_T *
+getmark(int c, int changefile)
+{
+    return getmark_buf_fnum(curbuf, c, changefile, NULL);
+}
+
+    pos_T *
+getmark_buf_fnum(
+    buf_T	*buf,
+    int		c,
+    int		changefile,
+    int		*fnum)
+{
+    pos_T		*posp;
+    pos_T		*startp, *endp;
+    static pos_T	pos_copy;
+
+    posp = NULL;
+
+    // Check for special key, can't be a mark name and might cause islower()
+    // to crash.
+    if (c < 0)
+	return posp;
+    if (c > '~')			// check for islower()/isupper()
+	;
+    else if (c == '\'' || c == '`')	// previous context mark
+    {
+	pos_copy = curwin->w_pcmark;	// need to make a copy because
+	posp = &pos_copy;		//   w_pcmark may be changed soon
+    }
+    else if (c == '"')			// to pos when leaving buffer
+	posp = &(buf->b_last_cursor);
+    else if (c == '^')			// to where Insert mode stopped
+	posp = &(buf->b_last_insert);
+    else if (c == '.')			// to where last change was made
+	posp = &(buf->b_last_change);
+    else if (c == '[')			// to start of previous operator
+	posp = &(buf->b_op_start);
+    else if (c == ']')			// to end of previous operator
+	posp = &(buf->b_op_end);
+    else if (c == '{' || c == '}')	// to previous/next paragraph
+    {
+	pos_T	pos;
+	oparg_T	oa;
+	int	slcb = listcmd_busy;
+
+	pos = curwin->w_cursor;
+	listcmd_busy = TRUE;	    // avoid that '' is changed
+	if (findpar(&oa.inclusive,
+			       c == '}' ? FORWARD : BACKWARD, 1L, NUL, FALSE))
+	{
+	    pos_copy = curwin->w_cursor;
+	    posp = &pos_copy;
+	}
+	curwin->w_cursor = pos;
+	listcmd_busy = slcb;
+    }
+    else if (c == '(' || c == ')')	// to previous/next sentence
+    {
+	pos_T	pos;
+	int	slcb = listcmd_busy;
+
+	pos = curwin->w_cursor;
+	listcmd_busy = TRUE;	    // avoid that '' is changed
+	if (findsent(c == ')' ? FORWARD : BACKWARD, 1L))
+	{
+	    pos_copy = curwin->w_cursor;
+	    posp = &pos_copy;
+	}
+	curwin->w_cursor = pos;
+	listcmd_busy = slcb;
+    }
+    else if (c == '<' || c == '>')	// start/end of visual area
+    {
+	startp = &buf->b_visual.vi_start;
+	endp = &buf->b_visual.vi_end;
+	if (((c == '<') == LT_POS(*startp, *endp) || endp->lnum == 0)
+							  && startp->lnum != 0)
+	    posp = startp;
+	else
+	    posp = endp;
+	/*
+	 * For Visual line mode, set mark at begin or end of line
+	 */
+	if (buf->b_visual.vi_mode == 'V')
+	{
+	    pos_copy = *posp;
+	    posp = &pos_copy;
+	    if (c == '<')
+		pos_copy.col = 0;
+	    else
+		pos_copy.col = MAXCOL;
+	    pos_copy.coladd = 0;
+	}
+    }
+    else if (ASCII_ISLOWER(c))		// normal named mark
+    {
+	posp = &(buf->b_namedm[c - 'a']);
+    }
+    else if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c))	// named file mark
+    {
+	if (VIM_ISDIGIT(c))
+	    c = c - '0' + NMARKS;
+	else
+	    c -= 'A';
+	posp = &(namedfm[c].fmark.mark);
+
+	if (namedfm[c].fmark.fnum == 0)
+	    fname2fnum(&namedfm[c]);
+
+	if (fnum != NULL)
+	    *fnum = namedfm[c].fmark.fnum;
+	else if (namedfm[c].fmark.fnum != buf->b_fnum)
+	{
+	    // mark is in another file
+	    posp = &pos_copy;
+
+	    if (namedfm[c].fmark.mark.lnum != 0
+				       && changefile && namedfm[c].fmark.fnum)
+	    {
+		if (buflist_getfile(namedfm[c].fmark.fnum,
+				      (linenr_T)1, GETF_SETMARK, FALSE) == OK)
+		{
+		    // Set the lnum now, autocommands could have changed it
+		    curwin->w_cursor = namedfm[c].fmark.mark;
+		    return (pos_T *)-1;
+		}
+		pos_copy.lnum = -1;	// can't get file
+	    }
+	    else
+		pos_copy.lnum = 0;	// mark exists, but is not valid in
+					// current buffer
+	}
+    }
+
+    return posp;
+}
+
+/*
+ * Search for the next named mark in the current file.
+ *
+ * Returns pointer to pos_T of the next mark or NULL if no mark is found.
+ */
+    pos_T *
+getnextmark(
+    pos_T	*startpos,	// where to start
+    int		dir,	// direction for search
+    int		begin_line)
+{
+    int		i;
+    pos_T	*result = NULL;
+    pos_T	pos;
+
+    pos = *startpos;
+
+    // When searching backward and leaving the cursor on the first non-blank,
+    // position must be in a previous line.
+    // When searching forward and leaving the cursor on the first non-blank,
+    // position must be in a next line.
+    if (dir == BACKWARD && begin_line)
+	pos.col = 0;
+    else if (dir == FORWARD && begin_line)
+	pos.col = MAXCOL;
+
+    for (i = 0; i < NMARKS; i++)
+    {
+	if (curbuf->b_namedm[i].lnum > 0)
+	{
+	    if (dir == FORWARD)
+	    {
+		if ((result == NULL || LT_POS(curbuf->b_namedm[i], *result))
+			&& LT_POS(pos, curbuf->b_namedm[i]))
+		    result = &curbuf->b_namedm[i];
+	    }
+	    else
+	    {
+		if ((result == NULL || LT_POS(*result, curbuf->b_namedm[i]))
+			&& LT_POS(curbuf->b_namedm[i], pos))
+		    result = &curbuf->b_namedm[i];
+	    }
+	}
+    }
+
+    return result;
+}
+
+/*
+ * For an xtended filemark: set the fnum from the fname.
+ * This is used for marks obtained from the .viminfo file.  It's postponed
+ * until the mark is used to avoid a long startup delay.
+ */
+    static void
+fname2fnum(xfmark_T *fm)
+{
+    char_u	*p;
+
+    if (fm->fname == NULL)
+	return;
+
+    /*
+     * First expand "~/" in the file name to the home directory.
+     * Don't expand the whole name, it may contain other '~' chars.
+     */
+    if (fm->fname[0] == '~' && (fm->fname[1] == '/'
+#ifdef BACKSLASH_IN_FILENAME
+		|| fm->fname[1] == '\\'
+#endif
+		))
+    {
+	int len;
+
+	expand_env((char_u *)"~/", NameBuff, MAXPATHL);
+	len = (int)STRLEN(NameBuff);
+	vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
+    }
+    else
+	vim_strncpy(NameBuff, fm->fname, MAXPATHL - 1);
+
+    // Try to shorten the file name.
+    mch_dirname(IObuff, IOSIZE);
+    p = shorten_fname(NameBuff, IObuff);
+
+    // buflist_new() will call fmarks_check_names()
+    (void)buflist_new(NameBuff, p, (linenr_T)1, 0);
+}
+
+/*
+ * Check all file marks for a name that matches the file name in buf.
+ * May replace the name with an fnum.
+ * Used for marks that come from the .viminfo file.
+ */
+    void
+fmarks_check_names(buf_T *buf)
+{
+    char_u	*name;
+    int		i;
+    win_T	*wp;
+
+    if (buf->b_ffname == NULL)
+	return;
+
+    name = home_replace_save(buf, buf->b_ffname);
+    if (name == NULL)
+	return;
+
+    for (i = 0; i < NMARKS + EXTRA_MARKS; ++i)
+	fmarks_check_one(&namedfm[i], name, buf);
+
+    FOR_ALL_WINDOWS(wp)
+    {
+	for (i = 0; i < wp->w_jumplistlen; ++i)
+	    fmarks_check_one(&wp->w_jumplist[i], name, buf);
+    }
+
+    vim_free(name);
+}
+
+    static void
+fmarks_check_one(xfmark_T *fm, char_u *name, buf_T *buf)
+{
+    if (fm->fmark.fnum == 0
+	    && fm->fname != NULL
+	    && fnamecmp(name, fm->fname) == 0)
+    {
+	fm->fmark.fnum = buf->b_fnum;
+	VIM_CLEAR(fm->fname);
+    }
+}
+
+/*
+ * Check a if a position from a mark is valid.
+ * Give and error message and return FAIL if not.
+ */
+    int
+check_mark(pos_T *pos)
+{
+    if (pos == NULL)
+    {
+	emsg(_(e_unknown_mark));
+	return FAIL;
+    }
+    if (pos->lnum <= 0)
+    {
+	// lnum is negative if mark is in another file can can't get that
+	// file, error message already give then.
+	if (pos->lnum == 0)
+	    emsg(_(e_mark_not_set));
+	return FAIL;
+    }
+    if (pos->lnum > curbuf->b_ml.ml_line_count)
+    {
+	emsg(_(e_mark_has_invalid_line_number));
+	return FAIL;
+    }
+    return OK;
+}
+
+/*
+ * clrallmarks() - clear all marks in the buffer 'buf'
+ *
+ * Used mainly when trashing the entire buffer during ":e" type commands
+ */
+    void
+clrallmarks(buf_T *buf)
+{
+    static int		i = -1;
+
+    if (i == -1)	// first call ever: initialize
+	for (i = 0; i < NMARKS + 1; i++)
+	{
+	    namedfm[i].fmark.mark.lnum = 0;
+	    namedfm[i].fname = NULL;
+#ifdef FEAT_VIMINFO
+	    namedfm[i].time_set = 0;
+#endif
+	}
+
+    for (i = 0; i < NMARKS; i++)
+	buf->b_namedm[i].lnum = 0;
+    buf->b_op_start.lnum = 0;		// start/end op mark cleared
+    buf->b_op_end.lnum = 0;
+    buf->b_last_cursor.lnum = 1;	// '" mark cleared
+    buf->b_last_cursor.col = 0;
+    buf->b_last_cursor.coladd = 0;
+    buf->b_last_insert.lnum = 0;	// '^ mark cleared
+    buf->b_last_change.lnum = 0;	// '. mark cleared
+    buf->b_changelistlen = 0;
+}
+
+/*
+ * Get name of file from a filemark.
+ * When it's in the current buffer, return the text at the mark.
+ * Returns an allocated string.
+ */
+    char_u *
+fm_getname(fmark_T *fmark, int lead_len)
+{
+    if (fmark->fnum == curbuf->b_fnum)		    // current buffer
+	return mark_line(&(fmark->mark), lead_len);
+    return buflist_nr2name(fmark->fnum, FALSE, TRUE);
+}
+
+/*
+ * Return the line at mark "mp".  Truncate to fit in window.
+ * The returned string has been allocated.
+ */
+    static char_u *
+mark_line(pos_T *mp, int lead_len)
+{
+    char_u	*s, *p;
+    int		len;
+
+    if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count)
+	return vim_strsave((char_u *)"-invalid-");
+    // Allow for up to 5 bytes per character.
+    s = vim_strnsave(skipwhite(ml_get(mp->lnum)), Columns * 5);
+    if (s == NULL)
+	return NULL;
+    // Truncate the line to fit it in the window.
+    len = 0;
+    for (p = s; *p != NUL; MB_PTR_ADV(p))
+    {
+	len += ptr2cells(p);
+	if (len >= Columns - lead_len)
+	    break;
+    }
+    *p = NUL;
+    return s;
+}
+
+/*
+ * print the marks
+ */
+    void
+ex_marks(exarg_T *eap)
+{
+    char_u	*arg = eap->arg;
+    int		i;
+    char_u	*name;
+    pos_T	*posp, *startp, *endp;
+
+    if (arg != NULL && *arg == NUL)
+	arg = NULL;
+
+    show_one_mark('\'', arg, &curwin->w_pcmark, NULL, TRUE);
+    for (i = 0; i < NMARKS; ++i)
+	show_one_mark(i + 'a', arg, &curbuf->b_namedm[i], NULL, TRUE);
+    for (i = 0; i < NMARKS + EXTRA_MARKS; ++i)
+    {
+	if (namedfm[i].fmark.fnum != 0)
+	    name = fm_getname(&namedfm[i].fmark, 15);
+	else
+	    name = namedfm[i].fname;
+	if (name != NULL)
+	{
+	    show_one_mark(i >= NMARKS ? i - NMARKS + '0' : i + 'A',
+		    arg, &namedfm[i].fmark.mark, name,
+		    namedfm[i].fmark.fnum == curbuf->b_fnum);
+	    if (namedfm[i].fmark.fnum != 0)
+		vim_free(name);
+	}
+    }
+    show_one_mark('"', arg, &curbuf->b_last_cursor, NULL, TRUE);
+    show_one_mark('[', arg, &curbuf->b_op_start, NULL, TRUE);
+    show_one_mark(']', arg, &curbuf->b_op_end, NULL, TRUE);
+    show_one_mark('^', arg, &curbuf->b_last_insert, NULL, TRUE);
+    show_one_mark('.', arg, &curbuf->b_last_change, NULL, TRUE);
+
+    // Show the marks as where they will jump to.
+    startp = &curbuf->b_visual.vi_start;
+    endp = &curbuf->b_visual.vi_end;
+    if ((LT_POS(*startp, *endp) || endp->lnum == 0) && startp->lnum != 0)
+	posp = startp;
+    else
+	posp = endp;
+    show_one_mark('<', arg, posp, NULL, TRUE);
+    show_one_mark('>', arg, posp == startp ? endp : startp, NULL, TRUE);
+
+    show_one_mark(-1, arg, NULL, NULL, FALSE);
+}
+
+    static void
+show_one_mark(
+    int		c,
+    char_u	*arg,
+    pos_T	*p,
+    char_u	*name_arg,
+    int		current)	// in current file
+{
+    static int	did_title = FALSE;
+    int		mustfree = FALSE;
+    char_u	*name = name_arg;
+
+    if (c == -1)			    // finish up
+    {
+	if (did_title)
+	    did_title = FALSE;
+	else
+	{
+	    if (arg == NULL)
+		msg(_("No marks set"));
+	    else
+		semsg(_(e_no_marks_matching_str), arg);
+	}
+    }
+    // don't output anything if 'q' typed at --more-- prompt
+    else if (!got_int
+	    && (arg == NULL || vim_strchr(arg, c) != NULL)
+	    && p->lnum != 0)
+    {
+	if (name == NULL && current)
+	{
+	    name = mark_line(p, 15);
+	    mustfree = TRUE;
+	}
+	if (!message_filtered(name))
+	{
+	    if (!did_title)
+	    {
+		// Highlight title
+		msg_puts_title(_("\nmark line  col file/text"));
+		did_title = TRUE;
+	    }
+	    msg_putchar('\n');
+	    if (!got_int)
+	    {
+		sprintf((char *)IObuff, " %c %6ld %4d ", c, p->lnum, p->col);
+		msg_outtrans(IObuff);
+		if (name != NULL)
+		{
+		    msg_outtrans_attr(name, current ? HL_ATTR(HLF_D) : 0);
+		}
+	    }
+	    out_flush();		    // show one line at a time
+	}
+	if (mustfree)
+	    vim_free(name);
+    }
+}
+
+/*
+ * ":delmarks[!] [marks]"
+ */
+    void
+ex_delmarks(exarg_T *eap)
+{
+    char_u	*p;
+    int		from, to;
+    int		i;
+    int		lower;
+    int		digit;
+    int		n;
+
+    if (*eap->arg == NUL && eap->forceit)
+	// clear all marks
+	clrallmarks(curbuf);
+    else if (eap->forceit)
+	emsg(_(e_invalid_argument));
+    else if (*eap->arg == NUL)
+	emsg(_(e_argument_required));
+    else
+    {
+	// clear specified marks only
+	for (p = eap->arg; *p != NUL; ++p)
+	{
+	    lower = ASCII_ISLOWER(*p);
+	    digit = VIM_ISDIGIT(*p);
+	    if (lower || digit || ASCII_ISUPPER(*p))
+	    {
+		if (p[1] == '-')
+		{
+		    // clear range of marks
+		    from = *p;
+		    to = p[2];
+		    if (!(lower ? ASCII_ISLOWER(p[2])
+				: (digit ? VIM_ISDIGIT(p[2])
+				    : ASCII_ISUPPER(p[2])))
+			    || to < from)
+		    {
+			semsg(_(e_invalid_argument_str), p);
+			return;
+		    }
+		    p += 2;
+		}
+		else
+		    // clear one lower case mark
+		    from = to = *p;
+
+		for (i = from; i <= to; ++i)
+		{
+		    if (lower)
+			curbuf->b_namedm[i - 'a'].lnum = 0;
+		    else
+		    {
+			if (digit)
+			    n = i - '0' + NMARKS;
+			else
+			    n = i - 'A';
+			namedfm[n].fmark.mark.lnum = 0;
+			namedfm[n].fmark.fnum = 0;
+			VIM_CLEAR(namedfm[n].fname);
+#ifdef FEAT_VIMINFO
+			namedfm[n].time_set = digit ? 0 : vim_time();
+#endif
+		    }
+		}
+	    }
+	    else
+		switch (*p)
+		{
+		    case '"': curbuf->b_last_cursor.lnum = 0; break;
+		    case '^': curbuf->b_last_insert.lnum = 0; break;
+		    case '.': curbuf->b_last_change.lnum = 0; break;
+		    case '[': curbuf->b_op_start.lnum    = 0; break;
+		    case ']': curbuf->b_op_end.lnum      = 0; break;
+		    case '<': curbuf->b_visual.vi_start.lnum = 0; break;
+		    case '>': curbuf->b_visual.vi_end.lnum   = 0; break;
+		    case ' ': break;
+		    default:  semsg(_(e_invalid_argument_str), p);
+			      return;
+		}
+	}
+    }
+}
+
+/*
+ * print the jumplist
+ */
+    void
+ex_jumps(exarg_T *eap UNUSED)
+{
+    int		i;
+    char_u	*name;
+
+    cleanup_jumplist(curwin, TRUE);
+
+    // Highlight title
+    msg_puts_title(_("\n jump line  col file/text"));
+    for (i = 0; i < curwin->w_jumplistlen && !got_int; ++i)
+    {
+	if (curwin->w_jumplist[i].fmark.mark.lnum != 0)
+	{
+	    name = fm_getname(&curwin->w_jumplist[i].fmark, 16);
+
+	    // Make sure to output the current indicator, even when on an wiped
+	    // out buffer.  ":filter" may still skip it.
+	    if (name == NULL && i == curwin->w_jumplistidx)
+		name = vim_strsave((char_u *)"-invalid-");
+	    // apply :filter /pat/ or file name not available
+	    if (name == NULL || message_filtered(name))
+	    {
+		vim_free(name);
+		continue;
+	    }
+
+	    msg_putchar('\n');
+	    if (got_int)
+	    {
+		vim_free(name);
+		break;
+	    }
+	    sprintf((char *)IObuff, "%c %2d %5ld %4d ",
+		i == curwin->w_jumplistidx ? '>' : ' ',
+		i > curwin->w_jumplistidx ? i - curwin->w_jumplistidx
+					  : curwin->w_jumplistidx - i,
+		curwin->w_jumplist[i].fmark.mark.lnum,
+		curwin->w_jumplist[i].fmark.mark.col);
+	    msg_outtrans(IObuff);
+	    msg_outtrans_attr(name,
+			    curwin->w_jumplist[i].fmark.fnum == curbuf->b_fnum
+							? HL_ATTR(HLF_D) : 0);
+	    vim_free(name);
+	    ui_breakcheck();
+	}
+	out_flush();
+    }
+    if (curwin->w_jumplistidx == curwin->w_jumplistlen)
+	msg_puts("\n>");
+}
+
+    void
+ex_clearjumps(exarg_T *eap UNUSED)
+{
+    free_jumplist(curwin);
+    curwin->w_jumplistlen = 0;
+    curwin->w_jumplistidx = 0;
+}
+
+/*
+ * print the changelist
+ */
+    void
+ex_changes(exarg_T *eap UNUSED)
+{
+    int		i;
+    char_u	*name;
+
+    // Highlight title
+    msg_puts_title(_("\nchange line  col text"));
+
+    for (i = 0; i < curbuf->b_changelistlen && !got_int; ++i)
+    {
+	if (curbuf->b_changelist[i].lnum != 0)
+	{
+	    msg_putchar('\n');
+	    if (got_int)
+		break;
+	    sprintf((char *)IObuff, "%c %3d %5ld %4d ",
+		    i == curwin->w_changelistidx ? '>' : ' ',
+		    i > curwin->w_changelistidx ? i - curwin->w_changelistidx
+						: curwin->w_changelistidx - i,
+		    (long)curbuf->b_changelist[i].lnum,
+		    curbuf->b_changelist[i].col);
+	    msg_outtrans(IObuff);
+	    name = mark_line(&curbuf->b_changelist[i], 17);
+	    if (name == NULL)
+		break;
+	    msg_outtrans_attr(name, HL_ATTR(HLF_D));
+	    vim_free(name);
+	    ui_breakcheck();
+	}
+	out_flush();
+    }
+    if (curwin->w_changelistidx == curbuf->b_changelistlen)
+	msg_puts("\n>");
+}
+
+#define one_adjust(add) \
+    { \
+	lp = add; \
+	if (*lp >= line1 && *lp <= line2) \
+	{ \
+	    if (amount == MAXLNUM) \
+		*lp = 0; \
+	    else \
+		*lp += amount; \
+	} \
+	else if (amount_after && *lp > line2) \
+	    *lp += amount_after; \
+    }
+
+// don't delete the line, just put at first deleted line
+#define one_adjust_nodel(add) \
+    { \
+	lp = add; \
+	if (*lp >= line1 && *lp <= line2) \
+	{ \
+	    if (amount == MAXLNUM) \
+		*lp = line1; \
+	    else \
+		*lp += amount; \
+	} \
+	else if (amount_after && *lp > line2) \
+	    *lp += amount_after; \
+    }
+
+/*
+ * Adjust marks between "line1" and "line2" (inclusive) to move "amount" lines.
+ * Must be called before changed_*(), appended_lines() or deleted_lines().
+ * May be called before or after changing the text.
+ * When deleting lines "line1" to "line2", use an "amount" of MAXLNUM: The
+ * marks within this range are made invalid.
+ * If "amount_after" is non-zero adjust marks after "line2".
+ * Example: Delete lines 34 and 35: mark_adjust(34, 35, MAXLNUM, -2);
+ * Example: Insert two lines below 55: mark_adjust(56, MAXLNUM, 2, 0);
+ *				   or: mark_adjust(56, 55, MAXLNUM, 2);
+ */
+    void
+mark_adjust(
+    linenr_T	line1,
+    linenr_T	line2,
+    long	amount,
+    long	amount_after)
+{
+    mark_adjust_internal(line1, line2, amount, amount_after, TRUE);
+}
+
+    void
+mark_adjust_nofold(
+    linenr_T	line1,
+    linenr_T	line2,
+    long	amount,
+    long	amount_after)
+{
+    mark_adjust_internal(line1, line2, amount, amount_after, FALSE);
+}
+
+    static void
+mark_adjust_internal(
+    linenr_T	line1,
+    linenr_T	line2,
+    long	amount,
+    long	amount_after,
+    int		adjust_folds UNUSED)
+{
+    int		i;
+    int		fnum = curbuf->b_fnum;
+    linenr_T	*lp;
+    win_T	*win;
+    tabpage_T	*tab;
+    static pos_T initpos = {1, 0, 0};
+
+    if (line2 < line1 && amount_after == 0L)	    // nothing to do
+	return;
+
+    if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
+    {
+	// named marks, lower case and upper case
+	for (i = 0; i < NMARKS; i++)
+	{
+	    one_adjust(&(curbuf->b_namedm[i].lnum));
+	    if (namedfm[i].fmark.fnum == fnum)
+		one_adjust_nodel(&(namedfm[i].fmark.mark.lnum));
+	}
+	for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++)
+	{
+	    if (namedfm[i].fmark.fnum == fnum)
+		one_adjust_nodel(&(namedfm[i].fmark.mark.lnum));
+	}
+
+	// last Insert position
+	one_adjust(&(curbuf->b_last_insert.lnum));
+
+	// last change position
+	one_adjust(&(curbuf->b_last_change.lnum));
+
+	// last cursor position, if it was set
+	if (!EQUAL_POS(curbuf->b_last_cursor, initpos))
+	    one_adjust(&(curbuf->b_last_cursor.lnum));
+
+
+	// list of change positions
+	for (i = 0; i < curbuf->b_changelistlen; ++i)
+	    one_adjust_nodel(&(curbuf->b_changelist[i].lnum));
+
+	// Visual area
+	one_adjust_nodel(&(curbuf->b_visual.vi_start.lnum));
+	one_adjust_nodel(&(curbuf->b_visual.vi_end.lnum));
+
+#ifdef FEAT_QUICKFIX
+	// quickfix marks
+	qf_mark_adjust(NULL, line1, line2, amount, amount_after);
+	// location lists
+	FOR_ALL_TAB_WINDOWS(tab, win)
+	    qf_mark_adjust(win, line1, line2, amount, amount_after);
+#endif
+
+#ifdef FEAT_SIGNS
+	sign_mark_adjust(line1, line2, amount, amount_after);
+#endif
+    }
+
+    // previous context mark
+    one_adjust(&(curwin->w_pcmark.lnum));
+
+    // previous pcmark
+    one_adjust(&(curwin->w_prev_pcmark.lnum));
+
+    // saved cursor for formatting
+    if (saved_cursor.lnum != 0)
+	one_adjust_nodel(&(saved_cursor.lnum));
+
+    /*
+     * Adjust items in all windows related to the current buffer.
+     */
+    FOR_ALL_TAB_WINDOWS(tab, win)
+    {
+	if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
+	    // Marks in the jumplist.  When deleting lines, this may create
+	    // duplicate marks in the jumplist, they will be removed later.
+	    for (i = 0; i < win->w_jumplistlen; ++i)
+		if (win->w_jumplist[i].fmark.fnum == fnum)
+		    one_adjust_nodel(&(win->w_jumplist[i].fmark.mark.lnum));
+
+	if (win->w_buffer == curbuf)
+	{
+	    if ((cmdmod.cmod_flags & CMOD_LOCKMARKS) == 0)
+		// marks in the tag stack
+		for (i = 0; i < win->w_tagstacklen; i++)
+		    if (win->w_tagstack[i].fmark.fnum == fnum)
+			one_adjust_nodel(&(win->w_tagstack[i].fmark.mark.lnum));
+
+	    // the displayed Visual area
+	    if (win->w_old_cursor_lnum != 0)
+	    {
+		one_adjust_nodel(&(win->w_old_cursor_lnum));
+		one_adjust_nodel(&(win->w_old_visual_lnum));
+	    }
+
+	    // topline and cursor position for windows with the same buffer
+	    // other than the current window
+	    if (win != curwin)
+	    {
+		if (win->w_topline >= line1 && win->w_topline <= line2)
+		{
+		    if (amount == MAXLNUM)	    // topline is deleted
+		    {
+			if (line1 <= 1)
+			    win->w_topline = 1;
+			else
+			    win->w_topline = line1 - 1;
+		    }
+		    else if (win->w_topline > line1)
+			// keep topline on the same line, unless inserting just
+			// above it (we probably want to see that line then)
+			win->w_topline += amount;
+#ifdef FEAT_DIFF
+		    win->w_topfill = 0;
+#endif
+		}
+		else if (amount_after && win->w_topline > line2)
+		{
+		    win->w_topline += amount_after;
+#ifdef FEAT_DIFF
+		    win->w_topfill = 0;
+#endif
+		}
+		if (win->w_cursor.lnum >= line1 && win->w_cursor.lnum <= line2)
+		{
+		    if (amount == MAXLNUM) // line with cursor is deleted
+		    {
+			if (line1 <= 1)
+			    win->w_cursor.lnum = 1;
+			else
+			    win->w_cursor.lnum = line1 - 1;
+			win->w_cursor.col = 0;
+		    }
+		    else		// keep cursor on the same line
+			win->w_cursor.lnum += amount;
+		}
+		else if (amount_after && win->w_cursor.lnum > line2)
+		    win->w_cursor.lnum += amount_after;
+	    }
+
+#ifdef FEAT_FOLDING
+	    // adjust folds
+	    if (adjust_folds)
+		foldMarkAdjust(win, line1, line2, amount, amount_after);
+#endif
+	}
+    }
+
+#ifdef FEAT_DIFF
+    // adjust diffs
+    diff_mark_adjust(line1, line2, amount, amount_after);
+#endif
+}
+
+// This code is used often, needs to be fast.
+#define col_adjust(pp) \
+    { \
+	posp = pp; \
+	if (posp->lnum == lnum && posp->col >= mincol) \
+	{ \
+	    posp->lnum += lnum_amount; \
+	    if (col_amount < 0 && posp->col <= (colnr_T)-col_amount) \
+		posp->col = 0; \
+	    else if (posp->col < spaces_removed) \
+		posp->col = col_amount + spaces_removed; \
+	    else \
+		posp->col += col_amount; \
+	} \
+    }
+
+/*
+ * Adjust marks in line "lnum" at column "mincol" and further: add
+ * "lnum_amount" to the line number and add "col_amount" to the column
+ * position.
+ * "spaces_removed" is the number of spaces that were removed, matters when the
+ * cursor is inside them.
+ */
+    void
+mark_col_adjust(
+    linenr_T	lnum,
+    colnr_T	mincol,
+    long	lnum_amount,
+    long	col_amount,
+    int		spaces_removed)
+{
+    int		i;
+    int		fnum = curbuf->b_fnum;
+    win_T	*win;
+    pos_T	*posp;
+
+    if ((col_amount == 0L && lnum_amount == 0L)
+				       || (cmdmod.cmod_flags & CMOD_LOCKMARKS))
+	return; // nothing to do
+
+    // named marks, lower case and upper case
+    for (i = 0; i < NMARKS; i++)
+    {
+	col_adjust(&(curbuf->b_namedm[i]));
+	if (namedfm[i].fmark.fnum == fnum)
+	    col_adjust(&(namedfm[i].fmark.mark));
+    }
+    for (i = NMARKS; i < NMARKS + EXTRA_MARKS; i++)
+    {
+	if (namedfm[i].fmark.fnum == fnum)
+	    col_adjust(&(namedfm[i].fmark.mark));
+    }
+
+    // last Insert position
+    col_adjust(&(curbuf->b_last_insert));
+
+    // last change position
+    col_adjust(&(curbuf->b_last_change));
+
+    // list of change positions
+    for (i = 0; i < curbuf->b_changelistlen; ++i)
+	col_adjust(&(curbuf->b_changelist[i]));
+
+    // Visual area
+    col_adjust(&(curbuf->b_visual.vi_start));
+    col_adjust(&(curbuf->b_visual.vi_end));
+
+    // previous context mark
+    col_adjust(&(curwin->w_pcmark));
+
+    // previous pcmark
+    col_adjust(&(curwin->w_prev_pcmark));
+
+    // saved cursor for formatting
+    col_adjust(&saved_cursor);
+
+    /*
+     * Adjust items in all windows related to the current buffer.
+     */
+    FOR_ALL_WINDOWS(win)
+    {
+	// marks in the jumplist
+	for (i = 0; i < win->w_jumplistlen; ++i)
+	    if (win->w_jumplist[i].fmark.fnum == fnum)
+		col_adjust(&(win->w_jumplist[i].fmark.mark));
+
+	if (win->w_buffer == curbuf)
+	{
+	    // marks in the tag stack
+	    for (i = 0; i < win->w_tagstacklen; i++)
+		if (win->w_tagstack[i].fmark.fnum == fnum)
+		    col_adjust(&(win->w_tagstack[i].fmark.mark));
+
+	    // cursor position for other windows with the same buffer
+	    if (win != curwin)
+		col_adjust(&win->w_cursor);
+	}
+    }
+}
+
+/*
+ * When deleting lines, this may create duplicate marks in the
+ * jumplist. They will be removed here for the specified window.
+ * When "loadfiles" is TRUE first ensure entries have the "fnum" field set
+ * (this may be a bit slow).
+ */
+    void
+cleanup_jumplist(win_T *wp, int loadfiles)
+{
+    int	    i;
+    int	    from, to;
+    int	    mustfree;
+
+    if (loadfiles)
+    {
+	// If specified, load all the files from the jump list. This is
+	// needed to properly clean up duplicate entries, but will take some
+	// time.
+	for (i = 0; i < wp->w_jumplistlen; ++i)
+	{
+	    if ((wp->w_jumplist[i].fmark.fnum == 0) &&
+		    (wp->w_jumplist[i].fmark.mark.lnum != 0))
+		fname2fnum(&wp->w_jumplist[i]);
+	}
+    }
+
+    to = 0;
+    for (from = 0; from < wp->w_jumplistlen; ++from)
+    {
+	if (wp->w_jumplistidx == from)
+	    wp->w_jumplistidx = to;
+	for (i = from + 1; i < wp->w_jumplistlen; ++i)
+	    if (wp->w_jumplist[i].fmark.fnum
+					== wp->w_jumplist[from].fmark.fnum
+		    && wp->w_jumplist[from].fmark.fnum != 0
+		    && wp->w_jumplist[i].fmark.mark.lnum
+				  == wp->w_jumplist[from].fmark.mark.lnum)
+		break;
+	if (i >= wp->w_jumplistlen)	// not duplicate
+	    mustfree = FALSE;
+	else if (i > from + 1)		// non-adjacent duplicate
+	    // jumpoptions=stack: remove duplicates only when adjacent.
+	    mustfree = !(jop_flags & JOP_STACK);
+	else				// adjacent duplicate
+	    mustfree = TRUE;
+
+	if (mustfree)
+	    vim_free(wp->w_jumplist[from].fname);
+	else
+	    wp->w_jumplist[to++] = wp->w_jumplist[from];
+    }
+    if (wp->w_jumplistidx == wp->w_jumplistlen)
+	wp->w_jumplistidx = to;
+    wp->w_jumplistlen = to;
+}
+
+/*
+ * Copy the jumplist from window "from" to window "to".
+ */
+    void
+copy_jumplist(win_T *from, win_T *to)
+{
+    int		i;
+
+    for (i = 0; i < from->w_jumplistlen; ++i)
+    {
+	to->w_jumplist[i] = from->w_jumplist[i];
+	if (from->w_jumplist[i].fname != NULL)
+	    to->w_jumplist[i].fname = vim_strsave(from->w_jumplist[i].fname);
+    }
+    to->w_jumplistlen = from->w_jumplistlen;
+    to->w_jumplistidx = from->w_jumplistidx;
+}
+
+/*
+ * Free items in the jumplist of window "wp".
+ */
+    void
+free_jumplist(win_T *wp)
+{
+    int		i;
+
+    for (i = 0; i < wp->w_jumplistlen; ++i)
+	vim_free(wp->w_jumplist[i].fname);
+}
+
+    void
+set_last_cursor(win_T *win)
+{
+    if (win->w_buffer != NULL)
+	win->w_buffer->b_last_cursor = win->w_cursor;
+}
+
+#if defined(EXITFREE) || defined(PROTO)
+    void
+free_all_marks(void)
+{
+    int		i;
+
+    for (i = 0; i < NMARKS + EXTRA_MARKS; i++)
+	if (namedfm[i].fmark.mark.lnum != 0)
+	    vim_free(namedfm[i].fname);
+}
+#endif
+
+#if defined(FEAT_VIMINFO) || defined(PROTO)
+/*
+ * Return a pointer to the named file marks.
+ */
+    xfmark_T *
+get_namedfm(void)
+{
+    return namedfm;
+}
+#endif
+
+#if defined(FEAT_EVAL) || defined(PROTO)
+/*
+ * Add information about mark 'mname' to list 'l'
+ */
+    static int
+add_mark(list_T *l, char_u *mname, pos_T *pos, int bufnr, char_u *fname)
+{
+    dict_T	*d;
+    list_T	*lpos;
+
+    if (pos->lnum <= 0)
+	return OK;
+
+    d = dict_alloc();
+    if (d == NULL)
+	return FAIL;
+
+    if (list_append_dict(l, d) == FAIL)
+    {
+	dict_unref(d);
+	return FAIL;
+    }
+
+    lpos = list_alloc();
+    if (lpos == NULL)
+	return FAIL;
+
+    list_append_number(lpos, bufnr);
+    list_append_number(lpos, pos->lnum);
+    list_append_number(lpos, pos->col + 1);
+    list_append_number(lpos, pos->coladd);
+
+    if (dict_add_string(d, "mark", mname) == FAIL
+	    || dict_add_list(d, "pos", lpos) == FAIL
+	    || (fname != NULL && dict_add_string(d, "file", fname) == FAIL))
+	return FAIL;
+
+    return OK;
+}
+
+/*
+ * Get information about marks local to a buffer.
+ */
+    static void
+get_buf_local_marks(buf_T *buf, list_T *l)
+{
+    char_u	mname[3] = "' ";
+    int		i;
+
+    // Marks 'a' to 'z'
+    for (i = 0; i < NMARKS; ++i)
+    {
+	mname[1] = 'a' + i;
+	add_mark(l, mname, &buf->b_namedm[i], buf->b_fnum, NULL);
+    }
+
+    // Mark '' is a window local mark and not a buffer local mark
+    add_mark(l, (char_u *)"''", &curwin->w_pcmark, curbuf->b_fnum, NULL);
+
+    add_mark(l, (char_u *)"'\"", &buf->b_last_cursor, buf->b_fnum, NULL);
+    add_mark(l, (char_u *)"'[", &buf->b_op_start, buf->b_fnum, NULL);
+    add_mark(l, (char_u *)"']", &buf->b_op_end, buf->b_fnum, NULL);
+    add_mark(l, (char_u *)"'^", &buf->b_last_insert, buf->b_fnum, NULL);
+    add_mark(l, (char_u *)"'.", &buf->b_last_change, buf->b_fnum, NULL);
+    add_mark(l, (char_u *)"'<", &buf->b_visual.vi_start, buf->b_fnum, NULL);
+    add_mark(l, (char_u *)"'>", &buf->b_visual.vi_end, buf->b_fnum, NULL);
+}
+
+/*
+ * Get information about global marks ('A' to 'Z' and '0' to '9')
+ */
+    static void
+get_global_marks(list_T *l)
+{
+    char_u	mname[3] = "' ";
+    int		i;
+    char_u	*name;
+
+    // Marks 'A' to 'Z' and '0' to '9'
+    for (i = 0; i < NMARKS + EXTRA_MARKS; ++i)
+    {
+	if (namedfm[i].fmark.fnum != 0)
+	    name = buflist_nr2name(namedfm[i].fmark.fnum, TRUE, TRUE);
+	else
+	    name = namedfm[i].fname;
+	if (name != NULL)
+	{
+	    mname[1] = i >= NMARKS ? i - NMARKS + '0' : i + 'A';
+	    add_mark(l, mname, &namedfm[i].fmark.mark,
+		    namedfm[i].fmark.fnum, name);
+	    if (namedfm[i].fmark.fnum != 0)
+		vim_free(name);
+	}
+    }
+}
+
+/*
+ * getmarklist() function
+ */
+    void
+f_getmarklist(typval_T *argvars, typval_T *rettv)
+{
+    buf_T	*buf = NULL;
+
+    if (rettv_list_alloc(rettv) == FAIL)
+	return;
+
+    if (in_vim9script() && check_for_opt_buffer_arg(argvars, 0) == FAIL)
+	return;
+
+    if (argvars[0].v_type == VAR_UNKNOWN)
+    {
+	get_global_marks(rettv->vval.v_list);
+	return;
+    }
+
+    buf = tv_get_buf(&argvars[0], FALSE);
+    if (buf == NULL)
+	return;
+
+    get_buf_local_marks(buf, rettv->vval.v_list);
+}
+#endif