Permalink
Browse files

Merge branch 'feature/customizability' into develop

This merge introduces a lot of changes to Powerline. Most importantly,
it's a lot easier to customize it through
Pl#Theme#(Insert|Remove)Segment(), and through upcoming colorscheme
changing functions.

IMPORTANT! DO NOT set g:Powerline_cache_file = '', this will cause an
error on vim startup! If you want to disable the cache, set
g:Powerline_cache_enabled = 0 instead.

This commit includes the following (temporary) regressions:

* Removes Solarized theme
* Removes Control-P theme
* Minor changes to existing buffer themes

Some workarounds have to be found to make the Control-P theme work
again, and the Solarized theme has to be recreated using the new
colorscheme functions. This is on top of my todo list and should be
fixed within a couple of days.

For insertion/removal of segments, check out
autoload/Powerline/Segments* for available segments, and
autoload/Powerline/Themes/distinguished.vim for the current placement of
segments.

To add e.g. the current file size after the file info in the statusline,
add this to your vimrc:

call Pl#Theme#InsertSegment('filesize', 'after', 'fileinfo')

To remove e.g. the file info from the statusline, add this to your
vimrc:

call Pl#Theme#RemoveSegment('fileinfo')

You can also replace segments using
Pl#Theme#ReplaceSegment('old_segment', 'new_segment').

Closes #37, #42, #50.
  • Loading branch information...
Lokaltog committed Jan 21, 2012
2 parents 4d8a928 + 168e5a0 commit 404c8b0d400e98e685a2bbc81cdea1169f837071
Showing with 1,176 additions and 1,336 deletions.
  1. +1 −1 README.rst
  2. +42 −508 autoload/Pl.vim
  3. +153 −0 autoload/Pl/Colorscheme.vim
  4. +53 −4 autoload/Pl/{Colors.vim → Hi.vim}
  5. +39 −0 autoload/Pl/Match.vim
  6. +35 −0 autoload/Pl/Mod.vim
  7. +329 −0 autoload/Pl/Parser.vim
  8. +178 −0 autoload/Pl/Segment.vim
  9. +86 −0 autoload/Pl/Theme.vim
  10. +35 −0 autoload/Powerline/Colorschemes/distinguished.vim
  11. +41 −0 autoload/Powerline/Functions.vim
  12. +3 −0 autoload/Powerline/Functions/cfi.vim
  13. +12 −0 autoload/Powerline/Functions/ft_man.vim
  14. +7 −0 autoload/Powerline/Functions/fugitive.vim
  15. +16 −0 autoload/Powerline/Functions/syntastic.vim
  16. +11 −0 autoload/Powerline/Matches.vim
  17. +25 −0 autoload/Powerline/Segments.vim
  18. +5 −0 autoload/Powerline/Segments/cfi.vim
  19. +3 −0 autoload/Powerline/Segments/ft_man.vim
  20. +5 −0 autoload/Powerline/Segments/fugitive.vim
  21. +5 −0 autoload/Powerline/Segments/syntastic.vim
  22. +80 −0 autoload/Powerline/Themes/distinguished.vim
  23. +0 −273 doc/Powerline.txt
  24. +12 −12 plugin/Powerline.vim
  25. +0 −97 powerline/distinguished.vim
  26. +0 −93 powerline/distinguished/00-default.vim
  27. +0 −27 powerline/distinguished/50-command-t.vim
  28. +0 −21 powerline/distinguished/50-control-p.vim
  29. +0 −43 powerline/distinguished/50-gundo.vim
  30. +0 −27 powerline/distinguished/50-help.vim
  31. +0 −21 powerline/distinguished/50-lusty.vim
  32. +0 −27 powerline/distinguished/50-manpage.vim
  33. +0 −15 powerline/distinguished/50-minibufexplorer.vim
  34. +0 −21 powerline/distinguished/50-syntastic.vim
  35. +0 −21 powerline/distinguished/50-tagbar.vim
  36. +0 −53 powerline/solarized.vim
  37. +0 −72 powerline/solarized/00-default.vim
View
@@ -72,7 +72,7 @@ Troubleshooting
---------------
I can't see the fancy symbols, what's wrong?
- Make sure that you have ``let g:Powerline_symbols = 'fancy`` in your
+ Make sure that you have ``let g:Powerline_symbols = 'fancy'`` in your
``vimrc`` file. The settings may be loaded too late if you have this in
``gvimrc``, so always put this in your ``vimrc``.
Oops, something went wrong.

5 comments on commit 404c8b0

@pjg

This comment has been minimized.

Show comment Hide comment
@pjg

pjg Jan 21, 2012

Cool :) Too bad it has been reversed in the next commit, but it's the right approach :)

pjg replied Jan 21, 2012

Cool :) Too bad it has been reversed in the next commit, but it's the right approach :)

@Lokaltog

This comment has been minimized.

Show comment Hide comment
@Lokaltog

Lokaltog Jan 21, 2012

Owner

Sorry about that, I discovered a critical issue right after commiting it and I needed some sleep before I could fix it. I'll soon be committing a fixed version. ;)

Owner

Lokaltog replied Jan 21, 2012

Sorry about that, I discovered a critical issue right after commiting it and I needed some sleep before I could fix it. I'll soon be committing a fixed version. ;)

@pjg

This comment has been minimized.

Show comment Hide comment
@pjg

pjg Jan 21, 2012

Great you're on it :) GL!

pjg replied Jan 21, 2012

Great you're on it :) GL!

@Lokaltog

This comment has been minimized.

Show comment Hide comment
@Lokaltog

Lokaltog Jan 21, 2012

Owner

@pjg Check out 4a0a52c. Please let me know if you stumble upon any issues.

Owner

Lokaltog replied Jan 21, 2012

@pjg Check out 4a0a52c. Please let me know if you stumble upon any issues.

@pjg

This comment has been minimized.

Show comment Hide comment
@pjg

pjg Jan 21, 2012

Looks and works great! Although I have troubles with adding my own segments. Sent you an email ;)

pjg replied Jan 21, 2012

Looks and works great! Although I have troubles with adding my own segments. Sent you an email ;)

Please sign in to comment.