From cb0ba2563da023667ef1583c1bb92884c433779a Mon Sep 17 00:00:00 2001 From: haya14busa Date: Wed, 5 Feb 2014 23:15:57 +0900 Subject: [PATCH] Oops --- autoload/EasyMotion.vim | 2 +- autoload/EasyMotion/highlight.vim | 6 ++- plugin/EasyMotion.vim | 89 +------------------------------ 3 files changed, 7 insertions(+), 90 deletions(-) diff --git a/autoload/EasyMotion.vim b/autoload/EasyMotion.vim index 4cbc313..c47bddf 100644 --- a/autoload/EasyMotion.vim +++ b/autoload/EasyMotion.vim @@ -12,7 +12,7 @@ set cpo&vim " }}} " Init: {{{ function! EasyMotion#init() - call EasyMotion#highlight#init() + call EasyMotion#highlight#load() " Store previous motion info let s:previous = {} " Store previous operator-pending motion info for '.' repeat diff --git a/autoload/EasyMotion/highlight.vim b/autoload/EasyMotion/highlight.vim index d75885e..aa1d063 100644 --- a/autoload/EasyMotion/highlight.vim +++ b/autoload/EasyMotion/highlight.vim @@ -2,7 +2,7 @@ " FILE: highlight.vim " AUTHOR: haya14busa " Reference: https://github.com/t9md/vim-smalls -" Last Change: 04 Feb 2014. +" Last Change: 05 Feb 2014. " License: MIT license {{{ " Permission is hereby granted, free of charge, to any person obtaining " a copy of this software and associated documentation files (the @@ -30,6 +30,10 @@ let s:save_cpo = &cpo set cpo&vim " }}} +function! EasyMotion#highlight#load() + "load +endfunction + function! EasyMotion#highlight#init() "{{{ " -- Default highlighting ---------------- {{{ let g:EasyMotion_hl_group_target = get(g:, diff --git a/plugin/EasyMotion.vim b/plugin/EasyMotion.vim index b38b499..601f748 100644 --- a/plugin/EasyMotion.vim +++ b/plugin/EasyMotion.vim @@ -3,7 +3,7 @@ " Author: Kim Silkebækken " haya14busa " Source: https://github.com/Lokaltog/vim-easymotion -" Last Change: 02 Feb 2014. +" Last Change: 05 Feb 2014. " == Script initialization {{{ if expand("%:p") ==# expand(":p") unlet! g:EasyMotion_loaded @@ -48,93 +48,6 @@ let g:EasyMotion_command_line_key_mappings = "}}} -" -- Default highlighting ---------------- {{{ -let g:EasyMotion_hl_group_target = get(g:, - \ 'EasyMotion_hl_group_target', 'EasyMotionTarget') -let g:EasyMotion_hl2_first_group_target = get(g:, - \ 'EasyMotion_hl2_first_group_target', 'EasyMotionTarget2First') -let g:EasyMotion_hl2_second_group_target = get(g:, - \ 'EasyMotion_hl2_second_group_target', 'EasyMotionTarget2Second') -let g:EasyMotion_hl_group_shade = get(g:, - \ 'EasyMotion_hl_group_shade', 'EasyMotionShade') - -let g:EasyMotion_hl_inc_search = get(g:, - \ 'EasyMotion_hl_inc_search', 'EasyMotionIncSearch') -let g:EasyMotion_hl_inc_cursor = get(g:, - \ 'EasyMotion_hl_inc_cursor', 'EasyMotionIncCursor') -let g:EasyMotion_hl_move = get(g:, - \ 'EasyMotion_hl_move', 'EasyMotionMoveHL') - -let s:target_hl_defaults = { - \ 'gui' : ['NONE', '#ff0000' , 'bold'] - \ , 'cterm256': ['NONE', '196' , 'bold'] - \ , 'cterm' : ['NONE', 'red' , 'bold'] - \ } - -let s:target_hl2_first_defaults = { - \ 'gui' : ['NONE', '#ffb400' , 'bold'] - \ , 'cterm256': ['NONE', '11' , 'bold'] - \ , 'cterm' : ['NONE', 'yellow' , 'bold'] - \ } - -let s:target_hl2_second_defaults = { - \ 'gui' : ['NONE', '#b98300' , 'bold'] - \ , 'cterm256': ['NONE', '3' , 'bold'] - \ , 'cterm' : ['NONE', 'yellow' , 'bold'] - \ } - -let s:shade_hl_defaults = { - \ 'gui' : ['NONE', '#777777' , 'NONE'] - \ , 'cterm256': ['NONE', '242' , 'NONE'] - \ , 'cterm' : ['NONE', 'grey' , 'NONE'] - \ } - -let s:shade_hl_line_defaults = { - \ 'gui' : ['red' , '#FFFFFF' , 'NONE'] - \ , 'cterm256': ['red' , '242' , 'NONE'] - \ , 'cterm' : ['red' , 'grey' , 'NONE'] - \ } - -let s:target_hl_inc = { - \ 'gui' : ['NONE', '#7fbf00' , 'bold'] - \ , 'cterm256': ['NONE', 'green' , 'bold'] - \ , 'cterm' : ['NONE', 'green' , 'bold'] - \ } -let s:target_hl_inc_cursor = { - \ 'gui' : ['#ACDBDA', '#121813' , 'bold'] - \ , 'cterm256': ['cyan' , 'black' , 'bold'] - \ , 'cterm' : ['cyan' , 'black' , 'bold'] - \ } -let s:target_hl_move = { - \ 'gui' : ['#7fbf00', '#121813' , 'bold'] - \ , 'cterm256': ['green' , 'white' , 'bold'] - \ , 'cterm' : ['green' , 'white' , 'bold'] - \ } - -call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults) -call EasyMotion#init#InitHL(g:EasyMotion_hl2_first_group_target, s:target_hl2_first_defaults) -call EasyMotion#init#InitHL(g:EasyMotion_hl2_second_group_target, s:target_hl2_second_defaults) -call EasyMotion#init#InitHL(g:EasyMotion_hl_group_shade, s:shade_hl_defaults) - -call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_search, s:target_hl_inc) -call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_cursor, s:target_hl_inc_cursor) -call EasyMotion#init#InitHL(g:EasyMotion_hl_move, s:target_hl_move) - -" Reset highlighting after loading a new color scheme {{{ -augroup EasyMotionInitHL - autocmd! - - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults) - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl2_first_group_target, s:target_hl2_first_defaults) - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl2_second_group_target, s:target_hl2_second_defaults) - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_group_shade, s:shade_hl_defaults) - - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_search, s:target_hl_inc) - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_cursor, s:target_hl_inc_cursor) - autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_move, s:target_hl_move) -augroup end -" }}} -" }}} " }}} " == Mapping {{{