Merge branch 'dev': Bump up version to 1.0.0

README.md

@@ -7,7 +7,7 @@ incsearch.vim: Improved incremental searching
 [![](http://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![](http://img.shields.io/badge/doc-%3Ah%20incsearch.txt-red.svg)](doc/incsearch.txt)
 
-![](https://cloud.githubusercontent.com/assets/3797062/3866249/573444b2-1fc8-11e4-859a-7e5fb940c1bb.gif)
+![](https://raw.githubusercontent.com/haya14busa/i/master/incsearch.vim/incremental_regex_building.gif)
 
 Introduction
 ------------
@@ -66,7 +66,7 @@ map g/ <Plug>(incsearch-stay)
 
 #### Automatic :nohlsearch
 
-![](https://cloud.githubusercontent.com/assets/3797062/4518938/f3c11110-4ca6-11e4-88c6-708f510a0c3c.gif)
+![](https://raw.githubusercontent.com/haya14busa/i/master/incsearch.vim/incsearch_auto_nohlsearch.gif)
 
 Farewell, `nnoremap <Esc><Esc> :<C-u>nohlsearch<CR>`!
 This feature turns 'hlsearch' off automatically after searching-related motions.
@@ -102,6 +102,8 @@ let g:incsearch#magic = '\v'
 ### Smart backward word
 See `:h g:incsearch#smart_backward_word`
 
+![](https://raw.githubusercontent.com/haya14busa/i/master/incsearch.vim/incsearch_smart_backward_word.gif)
+
 ### Command Line Interface Keymappings
 incsearch.vim uses a custom command line interface, so it provides a custom
 keymapping interface(`IncSearchNoreMap`) like `cnoremap`. To use this command
@@ -133,7 +135,7 @@ Move the cursor to next/previous matches while incremental searching like Emacs.
 
 ### Scroll-like feature while incremental searching
 
-![](https://cloud.githubusercontent.com/assets/3797062/3931538/36979326-245a-11e4-9565-bd3d91e699d5.gif)
+![](https://raw.githubusercontent.com/haya14busa/i/master/incsearch.vim/incsearch_smart_backward_word.gif)
 
 | Mapping                      | description                                         |
 | ------------------------     | ---------------------------------                   |

autoload/incsearch.vim

@@ -382,22 +382,23 @@ function! s:on_char(cmdline) abort
 
     if raw_pattern ==# ''
         call s:hi.disable_all()
+        nohlsearch
         return
     endif
 
-    let pattern = s:convert(raw_pattern)
-
     " For InsertRegister
     if a:cmdline.get_tap_key() ==# "\<C-r>"
         let p = a:cmdline.getpos()
         " Remove `"`
         let raw_pattern = raw_pattern[:p-1] . raw_pattern[p+1:]
         let w = winsaveview()
-        call cursor(line('.'), col('.') + len(raw_pattern))
+        call cursor(line('.'), col('.') + len(a:cmdline.backward_word()))
         call s:InsertRegister.reset()
         call winrestview(w)
     endif
 
+    let pattern = s:convert(raw_pattern)
+
     " Improved Incremental cursor move!
     call s:move_cursor(pattern, a:cmdline.flag, offset)
 

doc/incsearch.txt

@@ -1,7 +1,7 @@
 *incsearch.txt*	Incrementally highlight all pattern matches
 
 Author  : haya14busa <[email protected]>
-Version : 0.9.9
+Version : 1.0.0
 License : MIT license {{{
 
 	Copyright (c) 2014 haya14busa
@@ -399,12 +399,23 @@ Version 2.0(?) Roadmap~
 	    - Implement fuzzy-search, migemo, spellcheck and other feature
 	    - Make public pattern converter API for customization
 	    - Write test for converer feature
-
-Version 1.0 Roadmap~
-1.0.0	1. More stable, compatible with default |/| behavior
-	2. More configurable options
+	3. More configurable options
 	    - e.g. option for prompt format including right prompt feature
 
+Version 1.0~
+
+1.0.0	2014-12-14
+	1. Improve compatibility with default commandline behavior
+	    - Automatically apply mappings defined with |:cnoremap| and |:cmap|
+	      See |g:incsearch#vim_cmdline_keymap|
+	    - Support multi {lhs} and <expr> mappings
+	2. Support incremental highlighting in other windows.
+	    - See |g:incsearch#no_inc_hlsearch|
+	3. Add |<Over>(buffer-complete-prev)|
+	4. Add |IncsearchExecute| event
+	5. Implement |:digraph| feature
+	6. Fix minor problems.
+
 0.9.9	2014-11-17
 	1. Smart backward word feature. See: |g:incsearch#smart_backward_word|
 	2. Implement |g:incsearch#vim_cmdline_keymap| option which apply