Fixing <cr> in .vimrc

Author: spf13

.vimrc

@@ -442,12 +442,13 @@
         inoremap <expr><C-g>     neocomplcache#undo_completion()
         inoremap <expr><C-l>     neocomplcache#complete_common_string()
 
-        " <CR>: close popup
+
+        " <CR>: close popup 
         " <s-CR>: close popup and save indent.
-        inoremap <expr><CR>  neocomplcache#close_popup()
-        inoremap <expr><s-CR>  neocomplcache#close_popup() . "\<CR>"
+        inoremap <expr><CR>  pumvisible() ? neocomplcache#close_popup() : "\<CR>"
+        inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup() "\<CR>" : "\<CR>" 
         " <TAB>: completion.
-        "inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
+        inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
 
         " <C-h>, <BS>: close popup and delete backword char.
         inoremap <expr><C-h> neocomplcache#smart_close_popup()."\<C-h>"