Commits

Meikel Brandmeyer  committed b7ae4b7

Fix serious regression in v2.3.2 concerning key mappings (reported by Perry Trolard)

  • Participants
  • Parent commits dc8d12d

Comments (0)

Files changed (3)

File vim/autoload/vimclojure.vim

 		let doSetup = g:vimclojure#SetupKeyMap
 	endif
 
-	if doSetup && !hasmapto("<Plug>Clojure" . a:plug, a:mode)
+	if doSetup && !hasmapto("<Plug>Clojure" . a:plug . ".", a:mode)
 		execute a:mode . "map <buffer> <unique> <silent> <LocalLeader>" . a:keys
 					\ . " <Plug>Clojure" . a:plug . "."
 	endif
 	set filetype=clojure
 	let b:vimclojure_namespace = a:namespace
 
-	if !hasmapto("<Plug>ClojureReplEnterHook", "i")
-		imap <buffer> <silent> <CR> <Plug>ClojureReplEnterHook
+	if !hasmapto("<Plug>ClojureReplEnterHook.", "i")
+		imap <buffer> <silent> <CR> <Plug>ClojureReplEnterHook.
 	endif
-	if !hasmapto("<Plug>ClojureReplEvaluate", "i")
-		imap <buffer> <silent> <C-CR> <Plug>ClojureReplEvaluate
+	if !hasmapto("<Plug>ClojureReplEvaluate.", "i")
+		imap <buffer> <silent> <C-CR> <Plug>ClojureReplEvaluate.
 	endif
-	if !hasmapto("<Plug>ClojureReplHatHook", "n")
-		nmap <buffer> <silent> ^ <Plug>ClojureReplHatHook
+	if !hasmapto("<Plug>ClojureReplHatHook.", "n")
+		nmap <buffer> <silent> ^ <Plug>ClojureReplHatHook.
 	endif
-	if !hasmapto("<Plug>ClojureReplUpHistory", "i")
-		imap <buffer> <silent> <C-Up> <Plug>ClojureReplUpHistory
+	if !hasmapto("<Plug>ClojureReplUpHistory.", "i")
+		imap <buffer> <silent> <C-Up> <Plug>ClojureReplUpHistory.
 	endif
-	if !hasmapto("<Plug>ClojureReplDownHistory", "i")
-		imap <buffer> <silent> <C-Down> <Plug>ClojureReplDownHistory
+	if !hasmapto("<Plug>ClojureReplDownHistory.", "i")
+		imap <buffer> <silent> <C-Down> <Plug>ClojureReplDownHistory.
 	endif
 
 	normal! G

File vim/doc/clojure.txt

 the end of the prompt and to the beginning of the line.
 
 The Plugs are:
- - <Plug>ClojureReplEnterHook for the enter key
- - <Plug>ClojureReplEvaluate for immediate evaluation (<C-CR>)
- - <Plug>ClojureReplHatHook for ^ navigation
- - <Plug>ClojureReplUpHistory for going backwards in history (<C-Up>)
- - <Plug>ClojureReplDownHistory for going forwards in history (<C-Down>)
+ - <Plug>ClojureReplEnterHook. for the enter key
+ - <Plug>ClojureReplEvaluate. for immediate evaluation (<C-CR>)
+ - <Plug>ClojureReplHatHook. for ^ navigation
+ - <Plug>ClojureReplUpHistory. for going backwards in history (<C-Up>)
+ - <Plug>ClojureReplDownHistory. for going forwards in history (<C-Down>)
 
 The following convenience commands are provided:
 

File vim/plugin/clojure.vim

 call vimclojure#MakeCommandPlug("n", "StartRepl", "vimclojure#StartRepl", "")
 call vimclojure#MakeCommandPlug("n", "StartLocalRepl", "vimclojure#StartRepl", "b:vimclojure_namespace")
 
-inoremap <Plug>ClojureReplEnterHook <Esc>:call b:vimclojure_repl.enterHook()<CR>
-inoremap <Plug>ClojureReplEvaluate <Esc>G$:call b:vimclojure_repl.enterHook()<CR>
-nnoremap <Plug>ClojureReplHatHook :call b:vimclojure_repl.hatHook()<CR>
-inoremap <Plug>ClojureReplUpHistory <C-O>:call b:vimclojure_repl.upHistory()<CR>
-inoremap <Plug>ClojureReplDownHistory <C-O>:call b:vimclojure_repl.downHistory()<CR>
+inoremap <Plug>ClojureReplEnterHook. <Esc>:call b:vimclojure_repl.enterHook()<CR>
+inoremap <Plug>ClojureReplEvaluate. <Esc>G$:call b:vimclojure_repl.enterHook()<CR>
+nnoremap <Plug>ClojureReplHatHook. :call b:vimclojure_repl.hatHook()<CR>
+inoremap <Plug>ClojureReplUpHistory. <C-O>:call b:vimclojure_repl.upHistory()<CR>
+inoremap <Plug>ClojureReplDownHistory. <C-O>:call b:vimclojure_repl.downHistory()<CR>
 
-nnoremap <Plug>ClojureCloseResultBuffer :call vimclojure#ResultBuffer.CloseBuffer()<CR>
+nnoremap <Plug>ClojureCloseResultBuffer. :call vimclojure#ResultBuffer.CloseBuffer()<CR>
 
 let &cpo = s:cpo_save