From 9844f14f66b570581eff45caff2e2003a4bb91e5 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Fri, 2 Aug 2013 17:56:12 +0000 Subject: [PATCH] change license to MIT --- LICENSE | 21 +++++++++ README.md | 2 +- autoload/airline.vim | 2 + autoload/airline/extensions.vim | 3 ++ autoload/airline/extensions/commandt.vim | 3 ++ autoload/airline/extensions/ctrlp.vim | 3 ++ autoload/airline/themes.vim | 3 ++ autoload/airline/themes/dark.vim | 56 +++++++++++++----------- autoload/airline/themes/light.vim | 1 - doc/airline.txt | 7 +-- plugin/airline.vim | 2 + 11 files changed, 70 insertions(+), 33 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4697735 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (C) 2013 Bailey Ling + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index a03e4f1..14c895b 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Contributions and pull requests are welcome. Please take note of the following # License -Distributed under the same terms as the Vim license. See `:help license`. +MIT license. Copyright (c) 2013 Bailey Ling. [a]: https://github.com/Lokaltog/vim-powerline diff --git a/autoload/airline.vim b/autoload/airline.vim index 0d6f8d2..938d369 100644 --- a/autoload/airline.vim +++ b/autoload/airline.vim @@ -1,4 +1,6 @@ +" MIT license. Copyright (c) 2013 Bailey Ling. " vim: ts=2 sts=2 sw=2 fdm=indent + let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running') let s:sections = ['a','b','c','gutter','x','y','z'] diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index a23bf1b..daae58c 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -1,3 +1,6 @@ +" MIT license. Copyright (c) 2013 Bailey Ling. +" vim: ts=2 sts=2 sw=2 fdm=indent + function! airline#extensions#apply_left_override(section1, section2) let w:airline_section_a = a:section1 let w:airline_section_b = a:section2 diff --git a/autoload/airline/extensions/commandt.vim b/autoload/airline/extensions/commandt.vim index e88b4c8..6ade032 100644 --- a/autoload/airline/extensions/commandt.vim +++ b/autoload/airline/extensions/commandt.vim @@ -1,3 +1,6 @@ +" MIT license. Copyright (c) 2013 Bailey Ling. +" vim: ts=2 sts=2 sw=2 fdm=indent + function! airline#extensions#commandt#apply_window_override() if bufname('%') ==# 'GoToFile' call airline#extensions#apply_left_override('CommandT', '') diff --git a/autoload/airline/extensions/ctrlp.vim b/autoload/airline/extensions/ctrlp.vim index d6296a3..a082e57 100644 --- a/autoload/airline/extensions/ctrlp.vim +++ b/autoload/airline/extensions/ctrlp.vim @@ -1,3 +1,6 @@ +" MIT license. Copyright (c) 2013 Bailey Ling. +" vim: ts=2 sts=2 sw=2 fdm=indent + function! airline#extensions#ctrlp#generate_color_map(dark, light, white) return { \ 'CtrlPdark' : a:dark, diff --git a/autoload/airline/themes.vim b/autoload/airline/themes.vim index 18d386d..95749d7 100644 --- a/autoload/airline/themes.vim +++ b/autoload/airline/themes.vim @@ -1,3 +1,6 @@ +" MIT license. Copyright (c) 2013 Bailey Ling. +" vim: ts=2 sts=2 sw=2 fdm=indent + " generates a dictionary which defines the colors for each highlight group function! airline#themes#generate_color_map(section1, section2, section3, file) " guifg guibg ctermfg ctermbg gui/term diff --git a/autoload/airline/themes/dark.vim b/autoload/airline/themes/dark.vim index ce10213..54e8e8d 100644 --- a/autoload/airline/themes/dark.vim +++ b/autoload/airline/themes/dark.vim @@ -1,44 +1,48 @@ -" Each theme is contained in its own file and declares variables scoped to the file. -" These variables represent the possible "modes" that airline can detect. The mode -" is the return value of mode(), which gets converted to a readable string. The -" following is a list currently supported modes: normal, insert, replace, visual, -" and inactive. +" Each theme is contained in its own file and declares variables scoped to the +" file. These variables represent the possible "modes" that airline can +" detect. The mode is the return value of mode(), which gets converted to a +" readable string. The following is a list currently supported modes: normal, +" insert, replace, visual, and inactive. " -" Each mode can also have overrides. These are small changes to the mode that don't -" require a completely different look. "modified" and "paste" are two such supported -" overrides. These are simply suffixed to the major mode, separated by an underscore. -" For example, "normal_modified" would be normal mode where the current buffer is -" modified. +" Each mode can also have overrides. These are small changes to the mode that +" don't require a completely different look. "modified" and "paste" are two +" such supported overrides. These are simply suffixed to the major mode, +" separated by an underscore. For example, "normal_modified" would be normal +" mode where the current buffer is modified. " -" The theming algorithm is a 2-pass system where the mode will draw over all parts of -" the statusline, and then the override is applied after. This means it is possible -" to specify a subset of the theme in overrides, as it will simply overwrite the -" previous colors. If you want simultaneous overrides, then they will need to -" change different parts of the statusline so they do not conflict with each other. +" The theming algorithm is a 2-pass system where the mode will draw over all +" parts of the statusline, and then the override is applied after. This means +" it is possible to specify a subset of the theme in overrides, as it will +" simply overwrite the previous colors. If you want simultaneous overrides, +" then they will need to change different parts of the statusline so they do +" not conflict with each other. " First let's define some arrays. The s: is just a VimL thing for scoping the -" variables to the current script. Without this, these variables would be declared -" globally. The array is in the format [ guifg, guibg, ctermfg, ctermbg, opts ]. +" variables to the current script. Without this, these variables would be +" declared globally. +" +" The array is in the format [ guifg, guibg, ctermfg, ctermbg, opts ]. " The opts takes in values from ":help attr-list". let s:file = [ '#ff0000' , '#1c1c1c' , 160 , 233 , '' ] let s:N1 = [ '#00005f' , '#dfff00' , 17 , 190 ] let s:N2 = [ '#ffffff' , '#444444' , 255 , 238 ] let s:N3 = [ '#9cffd3' , '#202020' , 85 , 234 ] -" vim-airline is made up of multiple sections, but for theming purposes there is -" only 3 sections: the mode, the branch indicator, and the gutter (which then get -" mirrored on the right side). generate_color_map is a helper function which -" generates a dictionary which declares the full colorscheme for the statusline. -" See the source code of "autoload/airline/themes.vim" for the full set of keys -" available for theming. +" vim-airline is made up of multiple sections, but for theming purposes there +" is only 3 sections: the mode, the branch indicator, and the gutter (which +" then get mirrored on the right side). generate_color_map is a helper +" function which generates a dictionary which declares the full colorscheme +" for the statusline. See the source code of "autoload/airline/themes.vim" +" for the full set of keys available for theming. " Now let's define the global g: variable that declares the colors used for -" normal mode. The # is a separator that maps with the directory structure +" normal mode. The # is a separator that maps with the directory structure. " If you get this wrong, Vim will complain loudly. let g:airline#themes#dark#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file) -" Here we define overrides for when the buffer is modified. This will be applied -" after g:airline#themes#dark#normal, hence why only certain keys are declared. +" Here we define overrides for when the buffer is modified. This will be +" applied after g:airline#themes#dark#normal, hence why only certain keys are +" declared. let g:airline#themes#dark#normal_modified = { \ 'info_separator': [ '#444444' , '#5f005f' , 238 , 53 , '' ] , \ 'statusline': [ '#ffffff' , '#5f005f' , 255 , 53 , '' ] , diff --git a/autoload/airline/themes/light.vim b/autoload/airline/themes/light.vim index f730f80..91a1017 100644 --- a/autoload/airline/themes/light.vim +++ b/autoload/airline/themes/light.vim @@ -1,4 +1,3 @@ - let s:file = [ '#df0000' , '#ffffff' , 160 , 255 ] let s:N1 = [ '#ffffff' , '#005fff' , 255 , 27 ] let s:N2 = [ '#000087' , '#00dfff' , 18 , 45 ] diff --git a/doc/airline.txt b/doc/airline.txt index 1f33c3d..bfa3d57 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -158,7 +158,7 @@ with the usual statusline syntax. let g:airline_section_a (the mode/paste indicator) let g:airline_section_b (the fugitive/lawrencium branch indicator) let g:airline_section_c (bufferline or filename) - let g:airline_section_gutter (syntastic and readonly flag) + let g:airline_section_gutter (syntastic, readonly flag, tagbar) let g:airline_section_x (filetype) let g:airline_section_y (fileencoding, fileformat) let g:airline_section_z (percentage, line number, column number) @@ -214,10 +214,7 @@ Contributions and pull requests are welcome. ============================================================================== LICENSE *airline-license* -Copyright © Bailey Ling. - -Distributed under the same terms as the vim |license|. - +MIT license. Copyright © 2013 Bailey Ling. vim:tw=78:ts=8:ft=help:norl: diff --git a/plugin/airline.vim b/plugin/airline.vim index 84c0567..ed86528 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -1,4 +1,6 @@ +" MIT license. Copyright (c) 2013 Bailey Ling. " vim: ts=2 sts=2 sw=2 fdm=indent + if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline) finish endif