Permalink
Browse files

Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1447 2a77ed30-b011-0410-a7ad-c7884a0aa172
  • Loading branch information...
1 parent 57ef8dc commit a0107f3d4adb58ced858751751c7d350b52c9691 edyfox committed Apr 30, 2009
Showing with 302 additions and 42 deletions.
  1. +221 −25 src/ex_cmds.c
  2. +8 −0 src/ex_docmd.c
  3. +7 −1 src/ex_getln.c
  4. +6 −3 src/fileio.c
  5. +5 −2 src/mark.c
  6. +6 −3 src/misc1.c
  7. +3 −2 src/misc2.c
  8. +12 −3 src/normal.c
  9. +9 −1 src/ops.c
  10. +3 −1 src/proto/ex_cmds.pro
  11. +9 −1 src/quickfix.c
  12. +12 −0 src/version.c
  13. +1 −0 src/vim.h
View
@@ -6543,20 +6543,7 @@ static int last_sign_typenr = MAX_TYPENR; /* is decremented */
static void sign_list_defined __ARGS((sign_T *sp));
static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
-/*
- * ":sign" command
- */
- void
-ex_sign(eap)
- exarg_T *eap;
-{
- char_u *arg = eap->arg;
- char_u *p;
- int idx;
- sign_T *sp;
- sign_T *sp_prev;
- buf_T *buf;
- static char *cmds[] = {
+static char *cmds[] = {
"define",
#define SIGNCMD_DEFINE 0
"undefine",
@@ -6569,22 +6556,51 @@ ex_sign(eap)
#define SIGNCMD_UNPLACE 4
"jump",
#define SIGNCMD_JUMP 5
+ NULL
#define SIGNCMD_LAST 6
- };
+};
+
+/*
+ * Find index of a ":sign" subcmd from its name.
+ * "*end_cmd" must be writable.
+ */
+ static int
+sign_cmd_idx(begin_cmd, end_cmd)
+ char *begin_cmd; /* begin of sign subcmd */
+ char *end_cmd; /* just after sign subcmd */
+{
+ int idx;
+ char save = *end_cmd;
+
+ *end_cmd = NUL;
+ for (idx = 0; ; ++idx)
+ if (cmds[idx] == NULL || STRCMP(begin_cmd, cmds[idx]) == 0)
+ break;
+ *end_cmd = save;
+ return idx;
+}
+
+/*
+ * ":sign" command
+ */
+ void
+ex_sign(eap)
+ exarg_T *eap;
+{
+ char_u *arg = eap->arg;
+ char_u *p;
+ int idx;
+ sign_T *sp;
+ sign_T *sp_prev;
+ buf_T *buf;
/* Parse the subcommand. */
p = skiptowhite(arg);
- if (*p != NUL)
- *p++ = NUL;
- for (idx = 0; ; ++idx)
+ idx = sign_cmd_idx(arg, p);
+ if (idx == SIGNCMD_LAST)
{
- if (idx == SIGNCMD_LAST)
- {
- EMSG2(_("E160: Unknown sign command: %s"), arg);
- return;
- }
- if (STRCMP(arg, cmds[idx]) == 0)
- break;
+ EMSG2(_("E160: Unknown sign command: %s"), arg);
+ return;
}
arg = skipwhite(p);
@@ -7110,6 +7126,186 @@ free_signs()
}
#endif
+#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
+static enum
+{
+ EXP_SUBCMD, /* expand :sign sub-commands */
+ EXP_DEFINE, /* expand :sign define {name} args */
+ EXP_PLACE, /* expand :sign place {id} args */
+ EXP_UNPLACE, /* expand :sign unplace" */
+ EXP_SIGN_NAMES /* expand with name of placed signs */
+} expand_what;
+
+/*
+ * Function given to ExpandGeneric() to obtain the sign command
+ * expansion.
+ */
+/*ARGSUSED*/
+ char_u *
+get_sign_name(xp, idx)
+ expand_T *xp;
+ int idx;
+{
+ sign_T *sp;
+ int current_idx;
+
+ switch (expand_what)
+ {
+ case EXP_SUBCMD:
+ return (char_u *)cmds[idx];
+ case EXP_DEFINE:
+ {
+ char *define_arg[] =
+ {
+ "icon=", "linehl=", "text=", "texthl=", NULL
+ };
+ return (char_u *)define_arg[idx];
+ }
+ case EXP_PLACE:
+ {
+ char *place_arg[] =
+ {
+ "line=", "name=", "file=", "buffer=", NULL
+ };
+ return (char_u *)place_arg[idx];
+ }
+ case EXP_UNPLACE:
+ {
+ char *unplace_arg[] = { "file=", "buffer=", NULL };
+ return (char_u *)unplace_arg[idx];
+ }
+ case EXP_SIGN_NAMES:
+ /* Complete with name of signs already defined */
+ current_idx = 0;
+ for (sp = first_sign; sp != NULL; sp = sp->sn_next)
+ if (current_idx++ == idx)
+ return sp->sn_name;
+ return NULL;
+ default:
+ return NULL;
+ }
+}
+
+/*
+ * Handle command line completion for :sign command.
+ */
+ void
+set_context_in_sign_cmd(xp, arg)
+ expand_T *xp;
+ char_u *arg;
+{
+ char_u *p;
+ char_u *end_subcmd;
+ char_u *last;
+ int cmd_idx;
+ char_u *begin_subcmd_args;
+
+ /* Default: expand subcommands. */
+ xp->xp_context = EXPAND_SIGN;
+ expand_what = EXP_SUBCMD;
+ xp->xp_pattern = arg;
+
+ end_subcmd = skiptowhite(arg);
+ if (*end_subcmd == NUL)
+ /* expand subcmd name
+ * :sign {subcmd}<CTRL-D>*/
+ return;
+
+ cmd_idx = sign_cmd_idx(arg, end_subcmd);
+
+ /* :sign {subcmd} {subcmd_args}
+ * |
+ * begin_subcmd_args */
+ begin_subcmd_args = skipwhite(end_subcmd);
+ p = skiptowhite(begin_subcmd_args);
+ if (*p == NUL)
+ {
+ /*
+ * Expand first argument of subcmd when possible.
+ * For ":jump {id}" and ":unplace {id}", we could
+ * possibly expand the ids of all signs already placed.
+ */
+ xp->xp_pattern = begin_subcmd_args;
+ switch (cmd_idx)
+ {
+ case SIGNCMD_LIST:
+ case SIGNCMD_UNDEFINE:
+ /* :sign list <CTRL-D>
+ * :sign undefine <CTRL-D> */
+ expand_what = EXP_SIGN_NAMES;
+ break;
+ default:
+ xp->xp_context = EXPAND_NOTHING;
+ }
+ return;
+ }
+
+ /* expand last argument of subcmd */
+
+ /* :sign define {name} {args}...
+ * |
+ * p */
+
+ /* Loop until reaching last argument. */
+ do
+ {
+ p = skipwhite(p);
+ last = p;
+ p = skiptowhite(p);
+ } while (*p != NUL);
+
+ p = vim_strchr(last, '=');
+
+ /* :sign define {name} {args}... {last}=
+ * | |
+ * last p */
+ if (p == NUL)
+ {
+ /* Expand last argument name (before equal sign). */
+ xp->xp_pattern = last;
+ switch (cmd_idx)
+ {
+ case SIGNCMD_DEFINE:
+ expand_what = EXP_DEFINE;
+ break;
+ case SIGNCMD_PLACE:
+ expand_what = EXP_PLACE;
+ break;
+ case SIGNCMD_JUMP:
+ case SIGNCMD_UNPLACE:
+ expand_what = EXP_UNPLACE;
+ break;
+ default:
+ xp->xp_context = EXPAND_NOTHING;
+ }
+ }
+ else
+ {
+ /* Expand last argument value (after equal sign). */
+ xp->xp_pattern = p + 1;
+ switch (cmd_idx)
+ {
+ case SIGNCMD_DEFINE:
+ if (STRNCMP(last, "texthl", p - last) == 0 ||
+ STRNCMP(last, "linehl", p - last) == 0)
+ xp->xp_context = EXPAND_HIGHLIGHT;
+ else if (STRNCMP(last, "icon", p - last) == 0)
+ xp->xp_context = EXPAND_FILES;
+ else
+ xp->xp_context = EXPAND_NOTHING;
+ break;
+ case SIGNCMD_PLACE:
+ if (STRNCMP(last, "name", p - last) == 0)
+ expand_what = EXP_SIGN_NAMES;
+ else
+ xp->xp_context = EXPAND_NOTHING;
+ break;
+ default:
+ xp->xp_context = EXPAND_NOTHING;
+ }
+ }
+}
+#endif
#endif
#if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
View
@@ -3695,6 +3695,11 @@ set_one_cmd_context(xp, buff)
set_context_in_cscope_cmd(xp, arg, ea.cmdidx);
break;
#endif
+#ifdef FEAT_SIGNS
+ case CMD_sign:
+ set_context_in_sign_cmd(xp, arg);
+ break;
+#endif
#ifdef FEAT_LISTCMDS
case CMD_bdelete:
case CMD_bwipeout:
@@ -5218,6 +5223,9 @@ static struct
{EXPAND_MENUS, "menu"},
{EXPAND_SETTINGS, "option"},
{EXPAND_SHELLCMD, "shellcmd"},
+#if defined(FEAT_SIGNS)
+ {EXPAND_SIGN, "sign"},
+#endif
{EXPAND_TAGS, "tag"},
{EXPAND_TAGS_LISTFILES, "tag_listfiles"},
{EXPAND_USER_VARS, "var"},
View
@@ -325,7 +325,7 @@ getcmdline(firstc, count, indent)
#endif
#ifdef FEAT_DIGRAPHS
- do_digraph(-1); /* init digraph typahead */
+ do_digraph(-1); /* init digraph typeahead */
#endif
/*
@@ -4521,6 +4521,9 @@ ExpandFromContext(xp, pat, num_file, file, options)
#ifdef FEAT_CSCOPE
{EXPAND_CSCOPE, get_cscope_name, TRUE},
#endif
+#ifdef FEAT_SIGNS
+ {EXPAND_SIGN, get_sign_name, TRUE},
+#endif
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
{EXPAND_LANGUAGE, get_lang_arg, TRUE},
@@ -6073,6 +6076,9 @@ ex_window()
set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
curbuf->b_p_ma = TRUE;
+#ifdef FEAT_FOLDING
+ curwin->w_p_fen = FALSE;
+#endif
# ifdef FEAT_RIGHTLEFT
curwin->w_p_rl = cmdmsg_rl;
cmdmsg_rl = FALSE;
View
@@ -6846,10 +6846,11 @@ buf_reload(buf, orig_mode)
#endif
#ifdef FEAT_FOLDING
{
- win_T *wp;
+ win_T *wp;
+ tabpage_T *tp;
/* Update folds unless they are defined manually. */
- FOR_ALL_WINDOWS(wp)
+ FOR_ALL_TAB_WINDOWS(tp, wp)
if (wp->w_buffer == curwin->w_buffer
&& !foldmethodIsManual(wp))
foldUpdateAll(wp);
@@ -8784,9 +8785,11 @@ apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
else
{
sfname = vim_strsave(fname);
- /* Don't try expanding FileType, Syntax, WindowID or QuickFixCmd* */
+ /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or
+ * QuickFixCmd* */
if (event == EVENT_FILETYPE
|| event == EVENT_SYNTAX
+ || event == EVENT_FUNCUNDEFINED
|| event == EVENT_REMOTEREPLY
|| event == EVENT_SPELLFILEMISSING
|| event == EVENT_QUICKFIXCMDPRE
View
@@ -1023,6 +1023,9 @@ mark_adjust(line1, line2, amount, amount_after)
int fnum = curbuf->b_fnum;
linenr_T *lp;
win_T *win;
+#ifdef FEAT_WINDOWS
+ tabpage_T *tab;
+#endif
if (line2 < line1 && amount_after == 0L) /* nothing to do */
return;
@@ -1064,7 +1067,7 @@ mark_adjust(line1, line2, amount, amount_after)
/* quickfix marks */
qf_mark_adjust(NULL, line1, line2, amount, amount_after);
/* location lists */
- FOR_ALL_WINDOWS(win)
+ FOR_ALL_TAB_WINDOWS(tab, win)
qf_mark_adjust(win, line1, line2, amount, amount_after);
#endif
@@ -1086,7 +1089,7 @@ mark_adjust(line1, line2, amount, amount_after)
/*
* Adjust items in all windows related to the current buffer.
*/
- FOR_ALL_WINDOWS(win)
+ FOR_ALL_TAB_WINDOWS(tab, win)
{
#ifdef FEAT_JUMPLIST
if (!cmdmod.lockmarks)
Oops, something went wrong.

0 comments on commit a0107f3

Please sign in to comment.