Updated ChangeLog.

[ci skip]

ChangeLog

@@ -1,3 +1,24 @@
+changes up to 3001566:
+	- New option `e`: Context aware snippets. This gives very precise and
+	  powerful control over when which snippet should be expanded.
+	  *UltiSnips-context-snippets*
+	- clearsnippets now clears all snippets below the current priority. This
+	  fits better with the priority system introduced in 3.0.
+	- Undo is more granular. Each jump and expand is now a separate undo step.
+	- UltiSnips now emits autocommands on certain events. *UltiSnips-custom-autocommands*
+	- New option `m`: Trim whitespace in all snippet lines.
+	- Improved syntax highlighting for snippets filetype.
+	- snipMate snippets support can be disabled. *UltiSnipsEnableSnipMate*
+	- UltiSnipsEditSplit got a new value 'context'. *UltiSnipsEditSplit*
+	- Mappings and autocommands are now only established when needed, i.e. when
+	  a snippet is active. This boosts performance outside of snippets.
+	- No longer supports Vim 7.3. Supported are Vim 7.4 and Neovim.
+	- Bug fixes, performance improvements, code cleanups and refactorings.
+	- Basic Unite integration.
+	- TagBar support.
+	- Ctags configuration file for snippet definitions.
+	- Now using waffle.io, gitter.im and travis-ci.com.
+
 version 3.0 (02-Mar-2014):
 	- Organisational changes: The project is now hosted on github. Snippets are
 	  now shipped separately - please track honza/vim-snippets.
@@ -135,4 +156,3 @@ version 1.1 (21-Jul-2009):
 	  with the same tab trigger ( *UltiSnips-adding-snippets* )
 	- Support for dotted filetype syntax. Now snippets for more than one filetype
 	  can be active ( *UltiSnips-adding-snippets* )
-

autoload/UltiSnips/map_keys.vim

@@ -38,7 +38,7 @@ endif
 
 " UltiSnipsEdit will use this variable to decide if a new window
 " is opened when editing. default is "normal", allowed are also
-" "vertical", "horizontal"
+" "vertical", "horizontal", and "context".
 if !exists("g:UltiSnipsEditSplit")
     let g:UltiSnipsEditSplit = 'normal'
 endif