diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-02-10 23:23:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-02-10 23:23:57 +0000 |
| commit | f52c725c4739f2d3368029d67218d6cae0d87995 (patch) | |
| tree | 15779b49216c2561112b3454c36020b879ee6876 /src | |
| parent | c7453f52d4eb5a5259b6b587d62b7e99e1ebdd10 (diff) | |
| download | vim-git-f52c725c4739f2d3368029d67218d6cae0d87995.tar.gz | |
updated for version 7.0196v7.0196
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 16 | ||||
| -rw-r--r-- | src/ex_cmds.h | 2 | ||||
| -rw-r--r-- | src/ui.c | 7 |
3 files changed, 23 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 3044ef892..50f688a76 100644 --- a/src/eval.c +++ b/src/eval.c @@ -15378,7 +15378,21 @@ var2fpos(varp, lnum) return NULL; return pp; } - if (name[0] == '$') /* last column or line */ + if (name[0] == 'w' && lnum) + { + pos.col = 0; + if (name[1] == '0') /* "w0": first visible line */ + { + pos.lnum = curwin->w_topline; + return &pos; + } + else if (name[1] == '$') /* "w$": last visible line */ + { + pos.lnum = curwin->w_botline - 1; + return &pos; + } + } + else if (name[0] == '$') /* last column or line */ { if (lnum) { diff --git a/src/ex_cmds.h b/src/ex_cmds.h index a5b055272..ca3bed0c3 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -497,6 +497,8 @@ EX(CMD_lchdir, "lchdir", ex_cd, BANG|FILE1|TRLBAR|CMDWIN), EX(CMD_lclose, "lclose", ex_cclose, RANGE|NOTADR|COUNT|TRLBAR), +EX(CMD_lcscope, "lcscope", do_cscope, + EXTRA|NOTRLCOM|SBOXOK|XFILE), EX(CMD_left, "left", ex_align, TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), EX(CMD_leftabove, "leftabove", ex_wrongmodifier, @@ -1593,7 +1593,10 @@ set_input_buf(p) #if defined(FEAT_GUI) || defined(FEAT_MOUSE_GPM) \ || defined(FEAT_XCLIPBOARD) || defined(VMS) \ - || defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) || defined(PROTO) + || defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) \ + || (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \ + || defined(FEAT_MENU))) \ + || defined(PROTO) /* * Add the given bytes to the input buffer * Special keys start with CSI. A real CSI must have been translated to @@ -1620,6 +1623,8 @@ add_to_input_buf(s, len) #if (defined(FEAT_XIM) && defined(FEAT_GUI_GTK)) \ || (defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)) \ + || (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \ + || defined(FEAT_MENU))) \ || defined(PROTO) /* * Add "str[len]" to the input buffer while escaping CSI bytes. |