From eccf570aea28f6ccbd0a62c055829e4dbedaa050 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Wed, 22 Apr 2015 11:11:41 +0200
Subject: [PATCH] Don't allow gj type mappings

Assuming a small screen and 'wrap' set:

The cursor is forced to stay in a certain column, so doing gj on a wrapped
line will jump into an area outside the position [x] and jump back into it
immediately effectively breaking navigation.

Solution: use local mappings that just do the usual h/j/k/l dance.

References #156.
---
 autoload/startify.vim | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index d23c561..77f41ef 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -134,20 +134,10 @@ function! startify#insane_in_the_membrane() abort
 
   setlocal nomodifiable nomodified
 
-  nnoremap <buffer><silent> e             :enew<cr>
-  nnoremap <buffer><silent> i             :enew <bar> startinsert<cr>
-  nnoremap <buffer><silent> <insert>      :enew <bar> startinsert<cr>
-  nnoremap <buffer><silent> b             :call <sid>set_mark('B')<cr>
-  nnoremap <buffer><silent> s             :call <sid>set_mark('S')<cr>
-  nnoremap <buffer><silent> t             :call <sid>set_mark('T')<cr>
-  nnoremap <buffer><silent> v             :call <sid>set_mark('V')<cr>
-  nnoremap <buffer><silent> <cr>          :call startify#open_buffers()<cr>
-  nnoremap <buffer><silent> <2-LeftMouse> :execute 'normal' matchstr(getline('.'), '\w\+')<cr>
-  nnoremap <buffer><silent> q             :call <sid>close()<cr>
-
+  call s:set_mappings()
   call cursor(s:firstline + (s:show_special ? 2 : 0), 5)
-
   autocmd startify CursorMoved <buffer> call s:set_cursor()
+
   set filetype=startify
   silent! doautocmd <nomodeline> User Startified
 endfunction
@@ -556,6 +546,35 @@ function! s:set_cursor() abort
   call cursor(s:newline, 5)
 endfunction
 
+" Function: s:set_mappings {{{1
+function! s:set_mappings() abort
+  nnoremap <buffer><silent> e             :enew<cr>
+  nnoremap <buffer><silent> i             :enew <bar> startinsert<cr>
+  nnoremap <buffer><silent> <insert>      :enew <bar> startinsert<cr>
+  nnoremap <buffer><silent> b             :call <sid>set_mark('B')<cr>
+  nnoremap <buffer><silent> s             :call <sid>set_mark('S')<cr>
+  nnoremap <buffer><silent> t             :call <sid>set_mark('T')<cr>
+  nnoremap <buffer><silent> v             :call <sid>set_mark('V')<cr>
+  nnoremap <buffer><silent> <cr>          :call startify#open_buffers()<cr>
+  nnoremap <buffer><silent> <2-LeftMouse> :execute 'normal' matchstr(getline('.'), '\w\+')<cr>
+  nnoremap <buffer><silent> q             :call <sid>close()<cr>
+
+  " Prevent 'nnoremap j gj' mappings, since they would break navigation.
+  " (One can't leave the [x].)
+  if !empty(mapcheck('h', 'n'))
+    nnoremap <buffer> h h
+  endif
+  if !empty(mapcheck('j', 'n'))
+    nnoremap <buffer> j j
+  endif
+  if !empty(mapcheck('k', 'n'))
+    nnoremap <buffer> k k
+  endif
+  if !empty(mapcheck('l', 'n'))
+    nnoremap <buffer> l l
+  endif
+endfunction
+
 " Function: s:set_mark {{{1
 "
 " Markers are saved in the s:marked dict using the follow format: