• R/O
  • SSH

vim: 提交

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

修訂36071a92cb764412276e067fed099164b0170436 (tree)
時間2005-12-12 06:36:39
作者vimboss
Commitervimboss

Log Message

updated for version 7.0167

Change Summary

差異

diff -r de152391f6f9 -r 36071a92cb76 runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Sun Dec 11 21:33:32 2005 +0000
+++ b/runtime/doc/todo.txt Sun Dec 11 21:36:39 2005 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 10
1+*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 11
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,12 +30,6 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-When a buffer has no name, ":w >>fname" uses "fname" for the buffer, that is
34-not logical.
35-
36-SwapExists with editexisting plugin: Is there a simple way to detect ":tag
37-function" and have the remote Vim jump to the tag?
38-
3933 When editing a file "a" that is a symbolic link to "b", while another Vim is
4034 editing "b", there is no warning. Follow symlink to make swap file name?
4135 Patch from Stefano Zacchiroli. Updated by James Vega, Dec 2.
@@ -156,6 +150,8 @@
156150 Complete command names by searching in $PATH. When completing file names
157151 escape special characters ";&<>(){}". (Adri Verhoef)
158152
153+Are there more commands where v:swapcommand can be set to something useful?
154+
159155 Awaiting response:
160156 - Win32: tearoff menu window should have a scrollbar when it's taller than
161157 the screen.
diff -r de152391f6f9 -r 36071a92cb76 runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Sun Dec 11 21:33:32 2005 +0000
+++ b/runtime/doc/version7.txt Sun Dec 11 21:36:39 2005 +0000
@@ -1,4 +1,4 @@
1-*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 09
1+*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 11
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -400,12 +400,8 @@
400400 |:diffoff| Switch off diff mode in the current window or in all
401401 windows.
402402
403-|:keepalt| Do not change the alternate file.
404-
405403 |:delmarks| Delete marks.
406404
407-|:sandbox| Command modifier: execute the argument in the sandbox.
408-
409405 |:exusage| Help for Ex commands (Nvi command).
410406
411407 |:viusage| Help for Vi commands (Nvi command).
@@ -422,6 +418,14 @@
422418 |:cexpr| Read error messages from a Vim expression (Yegappan
423419 Lakshmanan).
424420
421+Ex command modifiers: ~
422+
423+|:keepalt| Do not change the alternate file.
424+
425+|:noautocmd| Do not trigger autocommand events.
426+
427+|:sandbox| Execute a command in the sandbox.
428+
425429
426430 New and extended functions: ~
427431
@@ -607,6 +611,12 @@
607611 The |v:scrollstart| variable has been added to help finding the location in
608612 your script that causes the hit-enter prompt.
609613
614+To make it possible to handle the situation that a file is being edited that
615+is already being edited by another Vim instance, the |SwapExists| event has
616+been added. The |v:swapname|, |v:swapchoice| and |v:swapcommand| variables
617+can be used, for example to use the |client-server| functionality to bring the
618+other Vim to the foreground.
619+
610620 ==============================================================================
611621 IMPROVEMENTS *improvements-7*
612622
@@ -854,6 +864,11 @@
854864 In the ATTENTION prompt put the "Delete it" choice before "Quit" to make it
855865 more logical. (Robert Webb)
856866
867+When appending to a file while the buffer has no name the name of the appended
868+file would be used for the current buffer. But the buffer contents is
869+actually different from the file content. Don't set the file name, unless the
870+'P' flag is present in 'cpoptions'.
871+
857872 ==============================================================================
858873 COMPILE TIME CHANGES *compile-changes-7*
859874
@@ -1350,7 +1365,7 @@
13501365 given. Now report the first encountered error.
13511366
13521367 When using ":e ++enc=name file" and iconv() was used for conversion an error
1353-caused a fallback to no conversion. Now replace a character with '?' and
1368+caused a fall-back to no conversion. Now replace a character with '?' and
13541369 continue.
13551370
13561371 When opening a new buffer the local value of 'bomb' was not initialized from
@@ -1417,4 +1432,10 @@
14171432
14181433 Unix: ":w a;b~c" caused an error in expanding wildcards.
14191434
1435+When appending to a file with ":w >>fname" in a buffer without a name, causing
1436+the buffer to use "fname", the modified flag was reset.
1437+
1438+When appending to to current file the "not edited" flag would be reset.
1439+":w" would overwrite the file accidentally.
1440+
14201441 vim:tw=78:ts=8:ft=help:norl:
diff -r de152391f6f9 -r 36071a92cb76 src/eval.c
--- a/src/eval.c Sun Dec 11 21:33:32 2005 +0000
+++ b/src/eval.c Sun Dec 11 21:36:39 2005 +0000
@@ -340,6 +340,7 @@
340340 {VV_NAME("scrollstart", VAR_STRING), 0},
341341 {VV_NAME("swapname", VAR_STRING), VV_RO},
342342 {VV_NAME("swapchoice", VAR_STRING), 0},
343+ {VV_NAME("swapcommand", VAR_STRING), VV_RO},
343344 };
344345
345346 /* shorthand */
diff -r de152391f6f9 -r 36071a92cb76 src/main.c
--- a/src/main.c Sun Dec 11 21:33:32 2005 +0000
+++ b/src/main.c Sun Dec 11 21:36:39 2005 +0000
@@ -3492,6 +3492,15 @@
34923492 redir_off = save_ro;
34933493 --emsg_skip;
34943494
3495+ /* A client can tell us to redraw, but not to display the cursor, so do
3496+ * that here. */
3497+ setcursor();
3498+ out_flush();
3499+#ifdef FEAT_GUI
3500+ if (gui.in_use)
3501+ gui_update_cursor(FALSE, FALSE);
3502+#endif
3503+
34953504 return res;
34963505 }
34973506
Show on old repository browser