diff options
author | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
commit | b8c33ee22e78f48f52bfde7328d20efe73493149 (patch) | |
tree | af5a3a56a5094facb1c00472c0b1a3be7478eca2 /gvim/vim-7.2/7.2.154 | |
parent | 9c7f68c9ab1ed52a5c4c2cec57c71b15d2209f52 (diff) | |
parent | 34e8f8d7edc734b88753ff7cb0443f8489b02ee8 (diff) | |
download | aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.gz aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'gvim/vim-7.2/7.2.154')
-rw-r--r-- | gvim/vim-7.2/7.2.154 | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/gvim/vim-7.2/7.2.154 b/gvim/vim-7.2/7.2.154 deleted file mode 100644 index 7328903..0000000 --- a/gvim/vim-7.2/7.2.154 +++ /dev/null @@ -1,71 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.154 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.154 (after 7.2.132) -Problem: ":cd" is still possible in a SwapExists autocmd. -Solution: Set allbuf_lock in do_swapexists(). -Files: src/memline.c - - -*** ../vim-7.2.153/src/memline.c Wed Apr 22 15:37:12 2009 ---- src/memline.c Wed Apr 22 15:54:48 2009 -*************** -*** 3771,3778 **** - set_vim_var_string(VV_SWAPCHOICE, NULL, -1); - - /* Trigger SwapExists autocommands with <afile> set to the file being -! * edited. */ - apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); - - set_vim_var_string(VV_SWAPNAME, NULL, -1); - ---- 3771,3780 ---- - set_vim_var_string(VV_SWAPCHOICE, NULL, -1); - - /* Trigger SwapExists autocommands with <afile> set to the file being -! * edited. Disallow changing directory here. */ -! ++allbuf_lock; - apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); -+ --allbuf_lock; - - set_vim_var_string(VV_SWAPNAME, NULL, -1); - -*************** -*** 3798,3803 **** ---- 3800,3806 ---- - * - * Note: If BASENAMELEN is not correct, you will get error messages for - * not being able to open the swapfile -+ * Note: May trigger SwapExists autocmd, pointers may change! - */ - static char_u * - findswapname(buf, dirp, old_fname) -*** ../vim-7.2.153/src/version.c Wed Apr 22 15:37:12 2009 ---- src/version.c Wed Apr 22 15:55:48 2009 -*************** -*** 678,679 **** ---- 678,681 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 154, - /**/ - --- -ARTHUR: Be quiet! -DENNIS: Well you can't expect to wield supreme executive power just 'cause - some watery tart threw a sword at you! -ARTHUR: Shut up! -DENNIS: I mean, if I went around sayin' I was an empereror just because some - moistened bint had lobbed a scimitar at me they'd put me away! - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |