diff options
author | Florian Pritz <bluewind@xssn.at> | 2010-05-17 12:04:10 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2010-05-17 12:04:10 +0200 |
commit | 545b0b7de32c86264d4ec1eb7b7610e4c1c85946 (patch) | |
tree | 9ad399ce5176aee3c98f216f54a12a3e6d5290c6 /gvim/vim-7.2/7.2.314 | |
parent | 8dc1d552c0bab7b72371c3a1529e365410c7548c (diff) | |
parent | ac57415603ea60e9af632e70827dffa22cfff584 (diff) | |
download | aur-packages-545b0b7de32c86264d4ec1eb7b7610e4c1c85946.tar.gz aur-packages-545b0b7de32c86264d4ec1eb7b7610e4c1c85946.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'gvim/vim-7.2/7.2.314')
-rw-r--r-- | gvim/vim-7.2/7.2.314 | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/gvim/vim-7.2/7.2.314 b/gvim/vim-7.2/7.2.314 new file mode 100644 index 0000000..490605d --- /dev/null +++ b/gvim/vim-7.2/7.2.314 @@ -0,0 +1,56 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.314 +Fcc: outbox +From: Bram Moolenaar <Bram@moolenaar.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.314 +Problem: Missing function in small build. +Solution: Always include concat_str. +Files: src/misc1.c + + +*** ../vim-7.2.313/src/misc1.c 2009-12-02 17:15:04.000000000 +0100 +--- src/misc1.c 2009-12-02 17:44:55.000000000 +0100 +*************** +*** 4666,4672 **** + return dest; + } + +- #if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO) + /* + * Concatenate two strings and return the result in allocated memory. + * Returns NULL when out of memory. +--- 4666,4671 ---- +*************** +*** 4687,4693 **** + } + return dest; + } +- #endif + + /* + * Add a path separator to a file name, unless it already ends in a path +--- 4686,4691 ---- +*** ../vim-7.2.313/src/version.c 2009-12-02 17:15:04.000000000 +0100 +--- src/version.c 2009-12-02 17:47:18.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 314, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +9. All your daydreaming is preoccupied with getting a faster connection to the + net: 28.8...ISDN...cable modem...T1...T3. + + /// 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 /// |