diff options
| -rw-r--r-- | runtime/doc/scroll.txt | 30 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 14 | ||||
| -rw-r--r-- | src/main.c | 10 |
4 files changed, 43 insertions, 17 deletions
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index 1aa1b9304..847c83fe4 100644 --- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -1,4 +1,4 @@ -*scroll.txt* For Vim version 7.0aa. Last change: 2005 Apr 01 +*scroll.txt* For Vim version 7.0aa. Last change: 2005 Dec 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -153,31 +153,39 @@ to the closest character that is on the screen. The value of 'sidescroll' is not used. z<Right> or *zl* *z<Right>* -zl Scroll the screen [count] characters to the left. - This only works when 'wrap' is off. {not in Vi} +zl Move the view on the text [count] characters to the + right, thus scroll the text [count] characters to the + left. This only works when 'wrap' is off. {not in + Vi} z<Left> or *zh* *z<Left>* -zh Scroll the screen [count] characters to the right. - This only works when 'wrap' is off. {not in Vi} +zh Move the view on the text [count] characters to the + left, thus scroll the text [count] characters to the + right. This only works when 'wrap' is off. {not in + Vi} *zL* -zL Scroll the screen half a screenwidth to the left. - This only works when 'wrap' is off. {not in Vi} +zL Move the view on the text half a screenwidth to the + right, thus scroll the text half a screenwidth to the + left. This only works when 'wrap' is off. {not in + Vi} *zH* -zH Scroll the screen half a screenwidth to the right. - This only works when 'wrap' is off. {not in Vi} +zH Move the view on the text half a screenwidth to the + left, thus scroll the text half a screenwidth to the + right. This only works when 'wrap' is off. {not in + Vi} For the following two commands the cursor is not moved in the text, only the text scrolls on the screen. *zs* -zs Scroll the screen horizontally to position the cursor +zs Scroll the text horizontally to position the cursor at the start (left side) of the screen. This only works when 'wrap' is off. {not in Vi} *ze* -ze Scroll the screen horizontally to position the cursor +ze Scroll the text horizontally to position the cursor at the end (right side) of the screen. This only works when 'wrap' is off. {not in Vi} diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 5bc0035a4..55a63fdfb 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 14 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,10 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Using pipes to decrypt text still doesn't work, can't get the password. - :set shell=/bin/sh noshelltemp - :%!gpg --decrypt --no-tty --passphrase-fd 2 - When inside input() and using "CTRL-R =" causing an exception the command line isn't abandoned. (Yukihiro Nakadaira) diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index afc3497df..1137456e3 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 14 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -646,6 +646,8 @@ is already being edited by another Vim instance, the |SwapExists| event has been added. The |v:swapname|, |v:swapchoice| and |v:swapcommand| variables can be used, for example to use the |client-server| functionality to bring the other Vim to the foreground. +When starting Vim with a "-t tag" argument, there is an existing swapfile and +the user selects "quit" or "abort" then exit Vim. ============================================================================== IMPROVEMENTS *improvements-7* @@ -909,6 +911,10 @@ a hint that something might be wrong. Win32: Preserve the hidden attribute of the viminfo file. +In Insert mode CTRL-A didn't keep the last inserted text when using CTRL-O and +then a cursor key. Now keep the previously inserted text if nothing is +inserted after the CTRL-O. Allows using CTRL-O commands to move the cursor +without losing the last inserted text. ============================================================================== COMPILE TIME CHANGES *compile-changes-7* @@ -1483,4 +1489,10 @@ Unix: When filtering text with an external command Vim would still read input, causing text typed for the command (e.g., a password) to be eaten and echoed. Don't read input when the terminal is in cooked mode. +The Cygwin version of xxd used CR/LF line separators. (Corinna Vinschen) + +Unix: When filtering text through a shell command some resulting text may be +dropped. Now after detecting that the child has exited try reading some more +of its output. + vim:tw=78:ts=8:ft=help:norl: diff --git a/src/main.c b/src/main.c index bd40c6c7a..89bad4c95 100644 --- a/src/main.c +++ b/src/main.c @@ -820,9 +820,19 @@ main */ if (params.tagname != NULL) { +#if defined(HAS_SWAP_EXISTS_ACTION) + swap_exists_did_quit = FALSE; +#endif + vim_snprintf((char *)IObuff, IOSIZE, "ta %s", params.tagname); do_cmdline_cmd(IObuff); TIME_MSG("jumping to tag"); + +#if defined(HAS_SWAP_EXISTS_ACTION) + /* If the user doesn't want to edit the file then we quit here. */ + if (swap_exists_did_quit) + getout(1); +#endif } /* Execute any "+", "-c" and "-S" arguments. */ |