From 924d2b4bf90fc5532252d3156abb2f4dd9c719b1 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sat, 24 Jan 2015 18:05:17 -0500 Subject: [PATCH] convert to neobundle, disable eclim, work on emacs --- .emacs.d/Cask | 37 - .emacs.d/init.el | 276 +--- .emacs.d/install.sh | 20 - .emacs.d/snippets/TODO | 0 .emacs.d/themes/barak-theme-autoloads.el | 28 - .emacs.d/themes/barak-theme-half.el | 1052 ------------- .emacs.d/themes/barak-theme.el | 245 --- .vim/bundle/eclim/eclim/autoload/eclim.vim | 339 ----- .../eclim/eclim/autoload/eclim/client/nailgun.vim | 195 --- .../eclim/autoload/eclim/client/python/nailgun.py | 214 --- .../eclim/autoload/eclim/client/python/nailgun.vim | 115 -- .../eclim/eclim/autoload/eclim/common/buffers.vim | 401 ----- .../eclim/eclim/autoload/eclim/common/history.vim | 332 ----- .../eclim/autoload/eclim/common/largefile.vim | 58 - .../eclim/eclim/autoload/eclim/common/license.vim | 87 -- .../eclim/eclim/autoload/eclim/common/locate.vim | 655 -------- .../eclim/eclim/autoload/eclim/common/template.vim | 237 --- .../eclim/eclim/autoload/eclim/common/util.vim | 195 --- .vim/bundle/eclim/eclim/autoload/eclim/cygwin.vim | 60 - .../eclim/eclim/autoload/eclim/display/menu.vim | 103 -- .../eclim/eclim/autoload/eclim/display/signs.vim | 370 ----- .../eclim/eclim/autoload/eclim/display/window.vim | 352 ----- .vim/bundle/eclim/eclim/autoload/eclim/help.vim | 169 --- .../eclim/eclim/autoload/eclim/html/util.vim | 135 -- .../eclim/autoload/eclim/java/ant/complete.vim | 144 -- .../eclim/eclim/autoload/eclim/java/ant/doc.vim | 171 --- .../eclim/eclim/autoload/eclim/java/ant/ivy.vim | 31 - .../eclim/eclim/autoload/eclim/java/ant/util.vim | 36 - .../eclim/eclim/autoload/eclim/java/classpath.vim | 241 --- .../eclim/eclim/autoload/eclim/java/complete.vim | 188 --- .../eclim/eclim/autoload/eclim/java/correct.vim | 139 -- .../bundle/eclim/eclim/autoload/eclim/java/doc.vim | 272 ---- .../eclim/eclim/autoload/eclim/java/hierarchy.vim | 147 -- .../eclim/eclim/autoload/eclim/java/impl.vim | 341 ----- .../eclim/eclim/autoload/eclim/java/import.vim | 140 -- .../eclim/eclim/autoload/eclim/java/junit.vim | 247 --- .../eclim/eclim/autoload/eclim/java/logging.vim | 127 -- .../eclim/eclim/autoload/eclim/java/maven.vim | 255 ---- .../eclim/eclim/autoload/eclim/java/refactor.vim | 120 -- .../eclim/eclim/autoload/eclim/java/search.vim | 402 ----- .../bundle/eclim/eclim/autoload/eclim/java/src.vim | 88 -- .../eclim/eclim/autoload/eclim/java/tools.vim | 310 ---- .../eclim/eclim/autoload/eclim/java/util.vim | 352 ----- .vim/bundle/eclim/eclim/autoload/eclim/lang.vim | 619 -------- .../eclim/eclim/autoload/eclim/lang/hierarchy.vim | 139 -- .../eclim/autoload/eclim/project/problems.vim | 133 -- .../eclim/eclim/autoload/eclim/project/tree.vim | 518 ------- .../eclim/eclim/autoload/eclim/project/util.vim | 1444 ------------------ .../eclim/taglisttoo/lang/commonsvalidator.vim | 33 - .../autoload/eclim/taglisttoo/lang/eclimhelp.vim | 32 - .../autoload/eclim/taglisttoo/lang/forrest.vim | 39 - .../eclim/autoload/eclim/taglisttoo/lang/gant.vim | 33 - .../autoload/eclim/taglisttoo/lang/hibernate.vim | 37 - .../eclim/autoload/eclim/taglisttoo/lang/junit.vim | 33 - .../autoload/eclim/taglisttoo/lang/spring.vim | 33 - .../autoload/eclim/taglisttoo/lang/webxml.vim | 43 - .vim/bundle/eclim/eclim/autoload/eclim/tree.vim | 1236 --------------- .vim/bundle/eclim/eclim/autoload/eclim/util.vim | 1568 -------------------- .../eclim/eclim/autoload/eclim/vimplugin.vim | 82 - .vim/bundle/eclim/eclim/autoload/eclim/web.vim | 232 --- .../eclim/eclim/autoload/eclim/xml/definition.vim | 79 - .../eclim/eclim/autoload/eclim/xml/format.vim | 109 -- .../bundle/eclim/eclim/autoload/eclim/xml/util.vim | 137 -- .../eclim/eclim/autoload/eclim/xml/validate.vim | 84 -- .vim/bundle/eclim/eclim/bin/bash_complete | 21 - .vim/bundle/eclim/eclim/compiler/eclim_ant.vim | 87 -- .vim/bundle/eclim/eclim/compiler/eclim_javadoc.vim | 44 - .vim/bundle/eclim/eclim/compiler/eclim_make.vim | 56 - .vim/bundle/eclim/eclim/compiler/eclim_maven.vim | 61 - .vim/bundle/eclim/eclim/compiler/eclim_mvn.vim | 51 - .vim/bundle/eclim/eclim/compiler/eclim_xmllint.vim | 39 - .vim/bundle/eclim/eclim/dict/java | 32 - .vim/bundle/eclim/eclim/doc/404.txt | 11 - .vim/bundle/eclim/eclim/doc/archive/changes.txt | 1556 ------------------- .vim/bundle/eclim/eclim/doc/archive/news.txt | 478 ------ .vim/bundle/eclim/eclim/doc/archive/tags | 42 - .vim/bundle/eclim/eclim/doc/changes.txt | 515 ------- .vim/bundle/eclim/eclim/doc/cheatsheet.txt | 474 ------ .vim/bundle/eclim/eclim/doc/contribute.txt | 66 - .../eclim/eclim/doc/development/architecture.txt | 38 - .../eclim/eclim/doc/development/commands.txt | 248 ---- .../eclim/eclim/doc/development/gettingstarted.txt | 257 ---- .vim/bundle/eclim/eclim/doc/development/index.txt | 21 - .../bundle/eclim/eclim/doc/development/plugins.txt | 234 --- .vim/bundle/eclim/eclim/doc/development/tags | 7 - .vim/bundle/eclim/eclim/doc/eclimd.txt | 452 ------ .vim/bundle/eclim/eclim/doc/faq.txt | 373 ----- .vim/bundle/eclim/eclim/doc/features.txt | 181 --- .vim/bundle/eclim/eclim/doc/gettinghelp.txt | 54 - .vim/bundle/eclim/eclim/doc/gettingstarted.txt | 352 ----- .vim/bundle/eclim/eclim/doc/index.txt | 315 ---- .vim/bundle/eclim/eclim/doc/install.txt | 618 -------- .vim/bundle/eclim/eclim/doc/relatedprojects.txt | 27 - .vim/bundle/eclim/eclim/doc/tags | 443 ------ .vim/bundle/eclim/eclim/doc/vim/c/complete.txt | 24 - .vim/bundle/eclim/eclim/doc/vim/c/index.txt | 31 - .vim/bundle/eclim/eclim/doc/vim/c/inspection.txt | 64 - .vim/bundle/eclim/eclim/doc/vim/c/project.txt | 61 - .vim/bundle/eclim/eclim/doc/vim/c/search.txt | 153 -- .vim/bundle/eclim/eclim/doc/vim/c/tags | 14 - .vim/bundle/eclim/eclim/doc/vim/c/validate.txt | 36 - .../bundle/eclim/eclim/doc/vim/code_completion.txt | 90 -- .vim/bundle/eclim/eclim/doc/vim/core/eclim.txt | 202 --- .vim/bundle/eclim/eclim/doc/vim/core/history.txt | 90 -- .vim/bundle/eclim/eclim/doc/vim/core/index.txt | 12 - .vim/bundle/eclim/eclim/doc/vim/core/locate.txt | 134 -- .vim/bundle/eclim/eclim/doc/vim/core/project.txt | 516 ------- .vim/bundle/eclim/eclim/doc/vim/core/tags | 102 -- .vim/bundle/eclim/eclim/doc/vim/core/util.txt | 235 --- .vim/bundle/eclim/eclim/doc/vim/dltk/buildpath.txt | 58 - .vim/bundle/eclim/eclim/doc/vim/dltk/tags | 4 - .vim/bundle/eclim/eclim/doc/vim/html/index.txt | 149 -- .vim/bundle/eclim/eclim/doc/vim/html/tags | 8 - .vim/bundle/eclim/eclim/doc/vim/index.txt | 31 - .vim/bundle/eclim/eclim/doc/vim/java/ant.txt | 234 --- .vim/bundle/eclim/eclim/doc/vim/java/classpath.txt | 388 ----- .vim/bundle/eclim/eclim/doc/vim/java/complete.txt | 35 - .vim/bundle/eclim/eclim/doc/vim/java/format.txt | 78 - .vim/bundle/eclim/eclim/doc/vim/java/import.txt | 68 - .vim/bundle/eclim/eclim/doc/vim/java/index.txt | 57 - .../bundle/eclim/eclim/doc/vim/java/inspection.txt | 112 -- .vim/bundle/eclim/eclim/doc/vim/java/java.txt | 116 -- .vim/bundle/eclim/eclim/doc/vim/java/javadoc.txt | 121 -- .vim/bundle/eclim/eclim/doc/vim/java/logging.txt | 105 -- .vim/bundle/eclim/eclim/doc/vim/java/maven.txt | 85 -- .vim/bundle/eclim/eclim/doc/vim/java/methods.txt | 248 ---- .vim/bundle/eclim/eclim/doc/vim/java/refactor.txt | 174 --- .vim/bundle/eclim/eclim/doc/vim/java/search.txt | 261 ---- .vim/bundle/eclim/eclim/doc/vim/java/tags | 101 -- .vim/bundle/eclim/eclim/doc/vim/java/unittests.txt | 242 --- .vim/bundle/eclim/eclim/doc/vim/java/validate.txt | 134 -- .vim/bundle/eclim/eclim/doc/vim/java/webxml.txt | 38 - .../eclim/eclim/doc/vim/javascript/index.txt | 68 - .vim/bundle/eclim/eclim/doc/vim/javascript/tags | 4 - .vim/bundle/eclim/eclim/doc/vim/php/buildpath.txt | 61 - .vim/bundle/eclim/eclim/doc/vim/php/complete.txt | 27 - .vim/bundle/eclim/eclim/doc/vim/php/index.txt | 30 - .vim/bundle/eclim/eclim/doc/vim/php/search.txt | 123 -- .vim/bundle/eclim/eclim/doc/vim/php/tags | 13 - .vim/bundle/eclim/eclim/doc/vim/php/validate.txt | 46 - .../bundle/eclim/eclim/doc/vim/python/complete.txt | 21 - .vim/bundle/eclim/eclim/doc/vim/python/django.txt | 261 ---- .vim/bundle/eclim/eclim/doc/vim/python/index.txt | 107 -- .vim/bundle/eclim/eclim/doc/vim/python/search.txt | 63 - .vim/bundle/eclim/eclim/doc/vim/python/tags | 26 - .../bundle/eclim/eclim/doc/vim/python/validate.txt | 53 - .vim/bundle/eclim/eclim/doc/vim/refactoring.txt | 42 - .vim/bundle/eclim/eclim/doc/vim/ruby/buildpath.txt | 119 -- .vim/bundle/eclim/eclim/doc/vim/ruby/complete.txt | 25 - .vim/bundle/eclim/eclim/doc/vim/ruby/index.txt | 11 - .vim/bundle/eclim/eclim/doc/vim/ruby/search.txt | 132 -- .vim/bundle/eclim/eclim/doc/vim/ruby/tags | 16 - .vim/bundle/eclim/eclim/doc/vim/ruby/validate.txt | 36 - .vim/bundle/eclim/eclim/doc/vim/scala/complete.txt | 22 - .vim/bundle/eclim/eclim/doc/vim/scala/index.txt | 10 - .vim/bundle/eclim/eclim/doc/vim/scala/search.txt | 44 - .vim/bundle/eclim/eclim/doc/vim/scala/tags | 8 - .vim/bundle/eclim/eclim/doc/vim/scala/validate.txt | 36 - .vim/bundle/eclim/eclim/doc/vim/settings.txt | 58 - .vim/bundle/eclim/eclim/doc/vim/tags | 319 ---- .vim/bundle/eclim/eclim/doc/vim/xml/index.txt | 210 --- .vim/bundle/eclim/eclim/doc/vim/xml/tags | 14 - .vim/bundle/eclim/eclim/ftplugin/ant.vim | 60 - .../eclim/eclim/ftplugin/commonsvalidator.vim | 35 - .vim/bundle/eclim/eclim/ftplugin/eclimhelp.vim | 37 - .../eclim/eclim/ftplugin/eclipse_classpath.vim | 66 - .../eclim/eclim/ftplugin/forrestdocument.vim | 37 - .vim/bundle/eclim/eclim/ftplugin/forreststatus.vim | 37 - .vim/bundle/eclim/eclim/ftplugin/gant.vim | 35 - .vim/bundle/eclim/eclim/ftplugin/hibernate.vim | 44 - .vim/bundle/eclim/eclim/ftplugin/ivy.vim | 52 - .vim/bundle/eclim/eclim/ftplugin/java-xml.vim | 40 - .vim/bundle/eclim/eclim/ftplugin/java.vim | 253 ---- .vim/bundle/eclim/eclim/ftplugin/junitresult.vim | 35 - .vim/bundle/eclim/eclim/ftplugin/log4j.vim | 59 - .vim/bundle/eclim/eclim/ftplugin/make.vim | 32 - .vim/bundle/eclim/eclim/ftplugin/maven_project.vim | 35 - .vim/bundle/eclim/eclim/ftplugin/mvn_pom.vim | 55 - .vim/bundle/eclim/eclim/ftplugin/spring.vim | 36 - .vim/bundle/eclim/eclim/ftplugin/strutsconfig.vim | 28 - .vim/bundle/eclim/eclim/ftplugin/tld.vim | 36 - .vim/bundle/eclim/eclim/ftplugin/webxml.vim | 73 - .vim/bundle/eclim/eclim/ftplugin/xml.vim | 63 - .vim/bundle/eclim/eclim/indent/indentanything.vim | 683 --------- .vim/bundle/eclim/eclim/indent/xml.vim | 169 --- .vim/bundle/eclim/eclim/plugin/eclim.vim | 330 ---- .vim/bundle/eclim/eclim/plugin/ftdetect.vim | 101 -- .vim/bundle/eclim/eclim/plugin/ftdetect_jdt.vim | 57 - .vim/bundle/eclim/eclim/plugin/java_tools.vim | 60 - .vim/bundle/eclim/eclim/plugin/project.vim | 209 --- .vim/bundle/eclim/eclim/plugin/vimplugin.vim | 38 - .vim/bundle/eclim/eclim/syntax/ant.vim | 64 - .../bundle/eclim/eclim/syntax/commonsvalidator.vim | 27 - .vim/bundle/eclim/eclim/syntax/eclimhelp.vim | 29 - .../eclim/eclim/syntax/eclipse_classpath.vim | 27 - .vim/bundle/eclim/eclim/syntax/forrestdocument.vim | 27 - .vim/bundle/eclim/eclim/syntax/forreststatus.vim | 27 - .vim/bundle/eclim/eclim/syntax/gant.vim | 33 - .../eclim/eclim/syntax/groovy_simple_template.vim | 31 - .vim/bundle/eclim/eclim/syntax/hg.vim | 48 - .vim/bundle/eclim/eclim/syntax/hibernate.vim | 27 - .vim/bundle/eclim/eclim/syntax/ivy.vim | 27 - .vim/bundle/eclim/eclim/syntax/java.vim | 36 - .vim/bundle/eclim/eclim/syntax/junitresult.vim | 25 - .vim/bundle/eclim/eclim/syntax/log4j.vim | 49 - .vim/bundle/eclim/eclim/syntax/maven_project.vim | 27 - .vim/bundle/eclim/eclim/syntax/mvn_pom.vim | 27 - .vim/bundle/eclim/eclim/syntax/mysql.vim | 45 - .vim/bundle/eclim/eclim/syntax/perl.vim | 38 - .vim/bundle/eclim/eclim/syntax/spring.vim | 27 - .vim/bundle/eclim/eclim/syntax/sql.vim | 50 - .vim/bundle/eclim/eclim/syntax/strutsconfig.vim | 27 - .vim/bundle/eclim/eclim/syntax/tld.vim | 27 - .vim/bundle/eclim/eclim/syntax/webxml.vim | 27 - .vim/bundle/eclim/eclim/syntax/xml.vim | 43 - .vim/bundle/eclim/plugin/eclim.vim | 176 --- .vimrc | 90 +- 217 files changed, 56 insertions(+), 33678 deletions(-) delete mode 100644 .emacs.d/Cask delete mode 100755 .emacs.d/install.sh delete mode 100644 .emacs.d/snippets/TODO delete mode 100644 .emacs.d/themes/barak-theme-autoloads.el delete mode 100644 .emacs.d/themes/barak-theme-half.el delete mode 100644 .emacs.d/themes/barak-theme.el delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/client/nailgun.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.py delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/buffers.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/history.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/largefile.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/license.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/locate.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/template.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/common/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/cygwin.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/display/menu.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/display/signs.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/display/window.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/help.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/html/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/ant/complete.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/ant/doc.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/ant/ivy.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/ant/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/classpath.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/complete.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/correct.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/doc.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/hierarchy.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/impl.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/import.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/junit.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/logging.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/maven.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/refactor.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/search.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/src.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/tools.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/java/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/lang.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/lang/hierarchy.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/project/problems.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/project/tree.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/project/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/commonsvalidator.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/eclimhelp.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/forrest.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/gant.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/hibernate.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/junit.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/spring.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/taglisttoo/lang/webxml.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/tree.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/vimplugin.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/web.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/xml/definition.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/xml/format.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/xml/util.vim delete mode 100644 .vim/bundle/eclim/eclim/autoload/eclim/xml/validate.vim delete mode 100644 .vim/bundle/eclim/eclim/bin/bash_complete delete mode 100644 .vim/bundle/eclim/eclim/compiler/eclim_ant.vim delete mode 100644 .vim/bundle/eclim/eclim/compiler/eclim_javadoc.vim delete mode 100644 .vim/bundle/eclim/eclim/compiler/eclim_make.vim delete mode 100644 .vim/bundle/eclim/eclim/compiler/eclim_maven.vim delete mode 100644 .vim/bundle/eclim/eclim/compiler/eclim_mvn.vim delete mode 100644 .vim/bundle/eclim/eclim/compiler/eclim_xmllint.vim delete mode 100644 .vim/bundle/eclim/eclim/dict/java delete mode 100644 .vim/bundle/eclim/eclim/doc/404.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/archive/changes.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/archive/news.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/archive/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/changes.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/cheatsheet.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/contribute.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/development/architecture.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/development/commands.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/development/gettingstarted.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/development/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/development/plugins.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/development/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/eclimd.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/faq.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/features.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/gettinghelp.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/gettingstarted.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/install.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/relatedprojects.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/complete.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/inspection.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/project.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/search.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/c/validate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/code_completion.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/eclim.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/history.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/locate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/project.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/core/util.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/dltk/buildpath.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/dltk/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/html/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/html/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/ant.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/classpath.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/complete.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/format.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/import.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/inspection.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/java.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/javadoc.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/logging.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/maven.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/methods.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/refactor.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/search.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/unittests.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/validate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/java/webxml.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/javascript/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/javascript/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/php/buildpath.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/php/complete.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/php/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/php/search.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/php/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/php/validate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/python/complete.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/python/django.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/python/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/python/search.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/python/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/python/validate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/refactoring.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/ruby/buildpath.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/ruby/complete.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/ruby/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/ruby/search.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/ruby/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/ruby/validate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/scala/complete.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/scala/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/scala/search.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/scala/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/scala/validate.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/settings.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/tags delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/xml/index.txt delete mode 100644 .vim/bundle/eclim/eclim/doc/vim/xml/tags delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/ant.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/commonsvalidator.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/eclimhelp.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/eclipse_classpath.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/forrestdocument.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/forreststatus.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/gant.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/hibernate.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/ivy.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/java-xml.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/java.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/junitresult.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/log4j.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/make.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/maven_project.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/mvn_pom.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/spring.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/strutsconfig.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/tld.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/webxml.vim delete mode 100644 .vim/bundle/eclim/eclim/ftplugin/xml.vim delete mode 100644 .vim/bundle/eclim/eclim/indent/indentanything.vim delete mode 100644 .vim/bundle/eclim/eclim/indent/xml.vim delete mode 100644 .vim/bundle/eclim/eclim/plugin/eclim.vim delete mode 100644 .vim/bundle/eclim/eclim/plugin/ftdetect.vim delete mode 100644 .vim/bundle/eclim/eclim/plugin/ftdetect_jdt.vim delete mode 100644 .vim/bundle/eclim/eclim/plugin/java_tools.vim delete mode 100644 .vim/bundle/eclim/eclim/plugin/project.vim delete mode 100644 .vim/bundle/eclim/eclim/plugin/vimplugin.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/ant.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/commonsvalidator.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/eclimhelp.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/eclipse_classpath.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/forrestdocument.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/forreststatus.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/gant.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/groovy_simple_template.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/hg.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/hibernate.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/ivy.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/java.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/junitresult.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/log4j.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/maven_project.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/mvn_pom.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/mysql.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/perl.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/spring.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/sql.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/strutsconfig.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/tld.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/webxml.vim delete mode 100644 .vim/bundle/eclim/eclim/syntax/xml.vim delete mode 100644 .vim/bundle/eclim/plugin/eclim.vim diff --git a/.emacs.d/Cask b/.emacs.d/Cask deleted file mode 100644 index d240caa..0000000 --- a/.emacs.d/Cask +++ /dev/null @@ -1,37 +0,0 @@ -(source gnu) -(source marmalade) -(source melpa) -(source org) - -(depends-on "ack-and-a-half") -(depends-on "auto-complete") -(depends-on "auto-complete-clang") -(depends-on "auto-complete-clang-async") -(depends-on "cask") -(depends-on "cedit") -(depends-on "company-go") -(depends-on "dirtree") -(depends-on "elpy") -(depends-on "epc") -(depends-on "evil") -(depends-on "evil-leader") -(depends-on "exec-path-from-shell") -(depends-on "flx-ido") -(depends-on "flycheck") -(depends-on "git-gutter") -(depends-on "go-autocomplete") -(depends-on "go-mode") -(depends-on "go-mode") -(depends-on "grizzl") -(depends-on "jedi") -(depends-on "key-chord") -(depends-on "magit") -(depends-on "neotree") -(depends-on "pallet") -(depends-on "powerline") -(depends-on "powerline-evil") -(depends-on "projectile") -(depends-on "relative-buffers") -(depends-on "tabbar") -(depends-on "yasnippet") -(depends-on "zenburn-theme") diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 67aa0c4..d66ae88 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,266 +1,12 @@ -;; /This/ file (~init.el~) that you are reading -;; should be in this folder -(add-to-list 'load-path "~/.emacs.d/") -(add-to-list 'load-path "~/.emacs.d/neotree") +(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/") + ("org" . "http://orgmode.org/elpa/") + ("marmalade" . "http://marmalade-repo.org/packages/") + ("melpa-stable" . "http://melpa-stable.milkbox.net/packages/"))) +(package-initialize) -(if (< emacs-major-version 23) - (defun characterp (obj) - (and (char-or-string-p obj) (not (stringp obj))))) - -(fset 'yes-or-no-p 'y-or-n-p) -(menu-bar-mode -1) - -(setq tab-width 4) -(setq indent-tabs-mode nil) - -;; Package Manager -;; See ~Cask~ file for its configuration -;; https://github.com/cask/cask -(require 'cask "~/.cask/cask.el") -(cask-initialize) - -;; Keeps ~Cask~ file in sync with the packages -;; that you install/uninstall via ~M-x list-packages~ -;; https://github.com/rdallasgray/pallet -(require 'pallet) - -;; Root directory -(setq root-dir (file-name-directory - (or (buffer-file-name) load-file-name))) -(setq make-backup-files nil) -(setq auto-save-default nil) - -(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") -;; Don't show startup screen -(let ((background-color "#2F2F2F") - (foreground-color "LightGrey") - (fname "Inconsolata-13") - (fheight 45) - (fwidth 115)) - - (set-default-font fname) - (add-to-list 'default-frame-alist (cons 'font fname)) -; (set-background-color background-color) -; (add-to-list 'default-frame-alist (cons 'background-color background-color)) -; (set-foreground-color foreground-color) -; (add-to-list 'default-frame-alist (cons 'foreground-color foreground-color)) - (add-to-list 'default-frame-alist (cons 'height fheight)) - (add-to-list 'default-frame-alist (cons 'width fwidth)) -) -(setq inhibit-startup-screen t) - -;; Show keystrokes -(setq echo-keystrokes 0.02) - -;; Path -(require 'exec-path-from-shell) -(when (memq window-system '(mac ns)) - (exec-path-from-shell-initialize)) -(global-relative-buffers-mode) - -;; Tabbar -(defun autohide-tabbar () - "Make tabbar briefly show itself while you are switching - buffers with shortcuts. Tested with GNU Emacs 23." - (defvar *tabbar-autohide-delay* 3) - (interactive) - (tabbar-mode nil) - (defvar *tabbar-autohide-timer* nil) - (defun renew-tabbar-autohide-timer () - (if (timerp *tabbar-autohide-timer*) - (cancel-timer *tabbar-autohide-timer*)) - (setf *tabbar-autohide-timer* - (run-with-timer - 3 nil (lambda () - (tabbar-mode -1) - (setf *tabbar-autohide-timer* - nil))))) - (global-set-key - [C-next] - (lambda () - (interactive) - (if tabbar-mode - (tabbar-forward) - (tabbar-mode 1)) - (renew-tabbar-autohide-timer))) - (global-set-key - [C-prior] - (lambda () - (interactive) - (if tabbar-mode - (tabbar-backward) - (tabbar-mode 1)) - (renew-tabbar-autohide-timer)))) - (autohide-tabbar) - -;; Evil! -(require 'evil-leader) -(global-evil-leader-mode) -(evil-leader/set-leader ",") -(require 'evil) -(evil-mode 1) -(setq evil-default-cursor t) - -;; Jedi.el -(add-hook 'python-mode-hook 'jedi:setup) -(setq jedi:setup-keys t) ; optional -(setq jedi:complete-on-dot t) ; optional - -;; Git -(require 'magit) -(eval-after-load 'magit - (progn '(global-set-key (kbd "C-x g") 'magit-status))) - -;; gitgutter -(global-git-gutter-mode) -(custom-set-variables - '(git-gutter:hide-gutter t)) - -;; flx-ido completion system, recommended by Projectile -(require 'flx-ido) -(require 'grizzl) -(flx-ido-mode 1) -;; change it if you have a fast processor. -(setq flx-ido-threshhold 1000) - -;; Project management -(require 'ack-and-a-half) -(require 'projectile) -(setq projectile-completion-system 'grizzl) -(projectile-global-mode) - -; Autocomplete -(require 'auto-complete-config) -(ac-config-default) -(setq ac-dwim t) -(setq ac-expand-on-auto-complete nil) -(setq ac-use-fuzzy t) -(setq ac-auto-start t) -(define-key ac-completing-map (kbd "") 'ac-stop) - -; Company-mode autocomplete -(require 'company) ; load company mode -(require 'company-go) ; load company mode go backend -(setq company-tooltip-limit 20) ; bigger popup window -(setq company-minimum-prefix-length 0) ; autocomplete right after '.' -(setq company-idle-delay .3) ; shorter delay before autocompletion popup -(setq company-echo-delay 0) ; removes annoying blinking -(setq company-begin-commands '(self-insert-command)) ; start autocompletion only after typing - -;; Snippets -;; https://github.com/capitaomorte/yasnippet -(require 'yasnippet) -(yas-load-directory (concat root-dir "snippets")) -(yas-global-mode 1) - -;; Neotree -(require 'neotree) -(menu-bar-mode -1) - -(require 'key-chord) -(require 'tabbar) - -;; Functions -(defun move-cursor-next-pane () - "Move cursor to the next pane." - (interactive) - (other-window 1)) - -(defun move-cursor-previous-pane () - "Move cursor to the previous pane." - (interactive) - (other-window -1)) -;; Evil Key Defines -(define-key evil-normal-state-map "gc" 'kill-buffer-and-window) -(define-key evil-normal-state-map "gn" 'tabbar-forward-tab) -(define-key evil-normal-state-map "gp" 'tabbar-backward-tab) -(define-key evil-normal-state-map (kbd "C-e") 'move-end-of-line) -(define-key evil-normal-state-map (kbd "C-a") 'move-beginning-of-line) -(define-key evil-normal-state-map (kbd "C-j") 'move-cursor-next-pane) -(define-key evil-normal-state-map (kbd "C-k") 'move-cursor-previous-pane) - - -(define-key evil-insert-state-map (kbd "C-e") 'move-end-of-line) -(define-key evil-insert-state-map (kbd "C-a") 'move-beginning-of-line) -;(setq key-chord-two-keys-delay 0.5) -(key-chord-define evil-insert-state-map "jj" 'evil-normal-state) -(key-chord-mode 1) -(evil-leader/set-key - "o" 'projectile-switch-to-buffer - "t" 'projectile-find-file -) - -(load-theme 'barak t) - - - - -;; _ -;; | |__ _ _ _ __ _ _ _ __ _ __ _ ___ ___ -;; | / _` | ' \/ _` | || / _` / _` / -_|_-< -;; |_\__,_|_||_\__, |\_,_\__,_\__, \___/__/ -;; |___/ |___/ -(add-hook 'go-mode-hook (lambda () - (add-hook 'before-save-hook #'gofmt-before-save) - (setq indent-tabs-mode t) - (set (make-local-variable 'company-backends) '(company-go)) - (company-mode))) - - - - -;; Hack to get *Messages* in viper-mode. -;; ;; (must be done after loading viper) -;; ;; Futzing with fundamental-mode doesn't seem to help. -;; (save-excursion -;; (set-buffer "*Messages*") -;; (viper-change-state-to-vi)) - - - ;Tabbar settings (Simple groups) - ;(defun tabbar-buffer-groups () - ;"Return the list of group names the current buffer belongs to. - ;This function is a custom function for tabbar-mode's tabbar-buffer-groups. - ;This function group all buffers into 3 groups: - ;Those Dired, those user buffer, and those emacs buffer. - ;Emacs buffer are those starting with “*”." - ;(list - ;(cond - ;((string-equal "*" (substring (buffer-name) 0 1)) - ;"Emacs Buffer" - ;) - ;((eq major-mode 'dired-mode) - ;"Dired" - ;) - ;(t - ;"User Buffer" - ;) - ;))) ; from Xah Lee - ;(setq tabbar-buffer-groups-function 'tabbar-buffer-groups) - -;(tabbar-mode) - -;(add-to-list 'ex-token-alist '("ls" (list-buffers))) -;(add-to-list 'ex-token-alist '("mx" (icicle-execute-extended-command))) -;(vimpulse-map "gn" 'tabbar-forward-tab) -;(vimpulse-map "gp" 'tabbar-backward-tab) -;(vimpulse-map "gw" 'vimpulse-search-forward-for-symbol-at-point) -;(vimpulse-map "gK" 'kill-buffer-and-window) -;(vimpulse-map "gc" 'kill-buffer-and-window) -;(define-key viper-insert-global-user-map "\C-d" 'delete-char)) -;(define-key evil-normal-state-map "gn" 'tabbar-forward-tab) -;(define-key evil-normal-state-map "gp" 'tabbar-backward-tab) - -;(add-hook 'window-setup-hook 'delete-other-windows) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(custom-safe-themes (quote ("f2acfa2f448218e8868bbb4b914e9f5a8c580e8a33d19809f4a4f32ad306cab5" "9df3b76bdd78c0209521b4e0374dcbdd4f2c8cd40ca00fedcd499e53630c646b" "6ca7862869dcbf7079ab507dbceb37e42e71fe7dd4b83f994de9b42037436bf2" "7a3b1a9661a271313a71a5177f31f344f533cab4c68c47985571d28b8f320769" "9370aeac615012366188359cb05011aea721c73e1cb194798bc18576025cabeb" default)))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) +(defun require-package (package) + (setq-default highlight-tabs t) + "Install given PACKAGE." + (unless (package-installed-p package) + (unless (assoc package package-archive-contents) + (package-refresh-contents)))) diff --git a/.emacs.d/install.sh b/.emacs.d/install.sh deleted file mode 100755 index 5ea8508..0000000 --- a/.emacs.d/install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [[ ! -e ~/.cask ]] -then - echo "Cloning Cask repo" - git clone git@github.com:cask/cask.git ~/.cask -fi - -if [[ $(grep "cask/bin" ~/.bash_profile) == "" ]] -then - echo "Adding \$HOME/.cask/bin to \$PATH in ~/.bash_profile" - echo '' >> ~/.bash_profile - echo "# Added by ~/.emacs.d/install.sh" >> ~/.bash_profile - echo "export PATH=\$HOME/.cask/bin:\$PATH" >> ~/.bash_profile -fi - -export PATH=$HOME/.cask/bin:$PATH - -cd ~/.emacs.d -cask install diff --git a/.emacs.d/snippets/TODO b/.emacs.d/snippets/TODO deleted file mode 100644 index e69de29..0000000 diff --git a/.emacs.d/themes/barak-theme-autoloads.el b/.emacs.d/themes/barak-theme-autoloads.el deleted file mode 100644 index da174aa..0000000 --- a/.emacs.d/themes/barak-theme-autoloads.el +++ /dev/null @@ -1,28 +0,0 @@ -;;; zenburn-theme-autoloads.el --- automatically extracted autoloads -;; -;;; Code: - - -;;;### (autoloads nil "zenburn-theme" "zenburn-theme.el" (21208 56234 -;;;;;; 19803 585000)) -;;; Generated autoloads from zenburn-theme.el - -(and load-file-name (boundp 'custom-theme-load-path) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) - -(add-to-list 'safe-local-eval-forms '(when (require 'rainbow-mode nil t) (rainbow-mode 1))) - -;;;*** - -;;;### (autoloads nil nil ("zenburn-theme-pkg.el") (21208 56234 81574 -;;;;;; 838000)) - -;;;*** - -(provide 'barak-theme-autoloads) -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; zenburn-theme-autoloads.el ends here diff --git a/.emacs.d/themes/barak-theme-half.el b/.emacs.d/themes/barak-theme-half.el deleted file mode 100644 index 89f85d5..0000000 --- a/.emacs.d/themes/barak-theme-half.el +++ /dev/null @@ -1,1052 +0,0 @@ -;;; Code: - -(deftheme barak "Barak's Theme") - -;;; Color Palette - -(defvar zenburn-colors-alist - '(("zenburn-fg+1" . "#FFFFEF") - ("zenburn-fg" . "#DCDCCC") - ("zenburn-fg-1" . "#656555") - ("zenburn-bg-2" . "#000000") - ("zenburn-bg-1" . "#2B2B2B") - ("zenburn-bg-05" . "#383838") - ("zenburn-bg" . "#3F3F3F") - ("zenburn-bg+1" . "#4F4F4F") - ("zenburn-bg+2" . "#5F5F5F") - ("zenburn-bg+3" . "#6F6F6F") - ("zenburn-red+1" . "#DCA3A3") - ("zenburn-red" . "#CC9393") - ("zenburn-red-1" . "#BC8383") - ("zenburn-red-2" . "#AC7373") - ("zenburn-red-3" . "#9C6363") - ("zenburn-red-4" . "#8C5353") - ("zenburn-orange" . "#DFAF8F") - ("zenburn-yellow" . "#F0DFAF") - ("zenburn-yellow-1" . "#E0CF9F") - ("zenburn-yellow-2" . "#D0BF8F") - ("zenburn-green-1" . "#5F7F5F") - ("zenburn-green" . "#7F9F7F") - ("zenburn-green+1" . "#8FB28F") - ("zenburn-green+2" . "#9FC59F") - ("zenburn-green+3" . "#AFD8AF") - ("zenburn-green+4" . "#BFEBBF") - ("zenburn-cyan" . "#93E0E3") - ("zenburn-blue+1" . "#94BFF3") - ("zenburn-blue" . "#8CD0D3") - ("zenburn-blue-1" . "#7CB8BB") - ("zenburn-blue-2" . "#6CA0A3") - ("zenburn-blue-3" . "#5C888B") - ("zenburn-blue-4" . "#4C7073") - ("zenburn-blue-5" . "#366060") - ("zenburn-magenta" . "#DC8CC3"))) - -(defvar barak-colors-alist - '(("background" . "#000000") - ("cursor" . "#A7A7A7") - ("fg-default" . "#E0E0E0") - ("mouse" . "sienna1") - ("comment" . "#238E23") - ("constant" . "#E3AC3D") - ("docstring" . "DarkOrange") - ("zenburn-fg+1" . "#FFFFEF") - ("zenburn-fg" . "#DCDCCC") - ("zenburn-fg-1" . "#656555") - ("zenburn-bg-2" . "#000000") - ("zenburn-bg-1" . "#2B2B2B") - ("zenburn-bg-05" . "#383838") - ("zenburn-bg" . "#3F3F3F") - ("zenburn-bg+1" . "#4F4F4F") - ("zenburn-bg+2" . "#5F5F5F") - ("zenburn-bg+3" . "#6F6F6F") - ("zenburn-red+1" . "#DCA3A3") - ("zenburn-red" . "#CC9393") - ("zenburn-red-1" . "#BC8383") - ("zenburn-red-2" . "#AC7373") - ("zenburn-red-3" . "#9C6363") - ("zenburn-red-4" . "#8C5353") - ("zenburn-orange" . "#DFAF8F") - ("zenburn-yellow" . "#F0DFAF") - ("zenburn-yellow-1" . "#E0CF9F") - ("zenburn-yellow-2" . "#D0BF8F") - ("zenburn-green-1" . "#5F7F5F") - ("zenburn-green" . "#7F9F7F") - ("zenburn-green+1" . "#8FB28F") - ("zenburn-green+2" . "#9FC59F") - ("zenburn-green+3" . "#AFD8AF") - ("zenburn-green+4" . "#BFEBBF") - ("zenburn-cyan" . "#93E0E3") - ("zenburn-blue+1" . "#94BFF3") - ("zenburn-blue" . "#8CD0D3") - ("zenburn-blue-1" . "#7CB8BB") - ("zenburn-blue-2" . "#6CA0A3") - ("zenburn-blue-3" . "#5C888B") - ("zenburn-blue-4" . "#4C7073") - ("zenburn-blue-5" . "#366060") - ("zenburn-magenta" . "#DC8CC3")) - "List of Zenburn colors. -Each element has the form (NAME . HEX).") - - -(defmacro barak-with-color-variables (&rest body) - "`let' bind all colors defined in `zenburn-colors-alist' around BODY. -Also bind `class' to ((class color) (min-colors 89))." - (declare (indent 0)) - `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - barak-colors-alist)) - ,@body)) - -(defmacro zenburn-with-color-variables (&rest body) - "`let' bind all colors defined in `zenburn-colors-alist' around BODY. -Also bind `class' to ((class color) (min-colors 89))." - (declare (indent 0)) - `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - zenburn-colors-alist)) - ,@body)) - -;;; Theme Faces -(barak-with-color-variables - (custom-theme-set-faces - 'barak -;;;; Built-in -;;;;; basic coloring - '(button ((t (:underline t)))) - `(link ((t (:foreground ,zenburn-yellow :underline t :weight bold)))) - `(link-visited ((t (:foreground ,zenburn-yellow-2 :underline t :weight normal)))) - `(default ((t (:foreground ,fg-default :background ,background)))) - `(cursor ((t (:foreground ,cursor :background ,zenburn-fg+1)))) - `(escape-glyph ((t (:foreground ,zenburn-yellow :bold t)))) - `(fringe ((t (:foreground ,zenburn-fg :background ,zenburn-bg+1)))) - `(header-line ((t (:foreground ,zenburn-yellow - :background ,zenburn-bg-1 - :box (:line-width -1 :style released-button))))) - `(highlight ((t (:background ,zenburn-bg-05)))) - `(success ((t (:foreground ,zenburn-green :weight bold)))) - `(warning ((t (:foreground ,zenburn-orange :weight bold)))) -;;;;; compilation - `(compilation-column-face ((t (:foreground ,zenburn-yellow)))) - `(compilation-enter-directory-face ((t (:foreground ,zenburn-green)))) - `(compilation-error-face ((t (:foreground ,zenburn-red-1 :weight bold :underline t)))) - `(compilation-face ((t (:foreground ,zenburn-fg)))) - `(compilation-info-face ((t (:foreground ,zenburn-blue)))) - `(compilation-info ((t (:foreground ,zenburn-green+4 :underline t)))) - `(compilation-leave-directory-face ((t (:foreground ,zenburn-green)))) - `(compilation-line-face ((t (:foreground ,zenburn-yellow)))) - `(compilation-line-number ((t (:foreground ,zenburn-yellow)))) - `(compilation-message-face ((t (:foreground ,zenburn-blue)))) - `(compilation-warning-face ((t (:foreground ,zenburn-orange :weight bold :underline t)))) - `(compilation-mode-line-exit ((t (:foreground ,zenburn-green+2 :weight bold)))) - `(compilation-mode-line-fail ((t (:foreground ,zenburn-red :weight bold)))) - `(compilation-mode-line-run ((t (:foreground ,zenburn-yellow :weight bold)))) -;;;;; grep - `(grep-context-face ((t (:foreground ,zenburn-fg)))) - `(grep-error-face ((t (:foreground ,zenburn-red-1 :weight bold :underline t)))) - `(grep-hit-face ((t (:foreground ,zenburn-blue)))) - `(grep-match-face ((t (:foreground ,zenburn-orange :weight bold)))) - `(match ((t (:background ,zenburn-bg-1 :foreground ,zenburn-orange :weight bold)))) -;;;;; isearch - `(isearch ((t (:foreground ,zenburn-yellow-2 :weight bold :background ,zenburn-bg-1)))) - `(isearch-fail ((t (:foreground ,zenburn-fg :background ,zenburn-red-4)))) - `(lazy-highlight ((t (:foreground ,zenburn-yellow-2 :weight bold :background ,zenburn-bg-05)))) - - `(menu ((t (:foreground ,zenburn-fg :background ,zenburn-bg)))) - `(minibuffer-prompt ((t (:foreground ,zenburn-yellow)))) - `(mode-line - ((,class (:foreground ,zenburn-green+1 - :background ,zenburn-bg-1 - :box (:line-width -1 :style released-button))) - (t :inverse-video t))) - `(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold)))) - `(mode-line-inactive - ((t (:foreground ,zenburn-green-1 - :background ,zenburn-bg-05 - :box (:line-width -1 :style released-button))))) - `(region ((,class (:background ,zenburn-bg-1)) - (t :inverse-video t))) - `(secondary-selection ((t (:background ,zenburn-bg+2)))) - `(trailing-whitespace ((t (:background ,zenburn-red)))) - `(vertical-border ((t (:foreground ,zenburn-fg)))) -;;;;; font lock - `(font-lock-builtin-face ((t (:foreground ,zenburn-fg :weight bold)))) - `(font-lock-comment-face ((t (:foreground ,zenburn-green)))) - `(font-lock-comment-delimiter-face ((t (:foreground ,zenburn-green-1)))) - `(font-lock-constant-face ((t (:foreground ,zenburn-green+4)))) - `(font-lock-doc-face ((t (:foreground ,zenburn-green+2)))) - `(font-lock-function-name-face ((t (:foreground ,zenburn-cyan)))) - `(font-lock-keyword-face ((t (:foreground ,zenburn-yellow :weight bold)))) - `(font-lock-negation-char-face ((t (:foreground ,zenburn-yellow :weight bold)))) - `(font-lock-preprocessor-face ((t (:foreground ,zenburn-blue+1)))) - `(font-lock-regexp-grouping-construct ((t (:foreground ,zenburn-yellow :weight bold)))) - `(font-lock-regexp-grouping-backslash ((t (:foreground ,zenburn-green :weight bold)))) - `(font-lock-string-face ((t (:foreground ,zenburn-red)))) - `(font-lock-type-face ((t (:foreground ,zenburn-blue-1)))) - `(font-lock-variable-name-face ((t (:foreground ,zenburn-orange)))) - `(font-lock-warning-face ((t (:foreground ,zenburn-yellow-2 :weight bold)))) - - `(c-annotation-face ((t (:inherit font-lock-constant-face)))) -;;;;; newsticker - `(newsticker-date-face ((t (:foreground ,zenburn-fg)))) - `(newsticker-default-face ((t (:foreground ,zenburn-fg)))) - `(newsticker-enclosure-face ((t (:foreground ,zenburn-green+3)))) - `(newsticker-extra-face ((t (:foreground ,zenburn-bg+2 :height 0.8)))) - `(newsticker-feed-face ((t (:foreground ,zenburn-fg)))) - `(newsticker-immortal-item-face ((t (:foreground ,zenburn-green)))) - `(newsticker-new-item-face ((t (:foreground ,zenburn-blue)))) - `(newsticker-obsolete-item-face ((t (:foreground ,zenburn-red)))) - `(newsticker-old-item-face ((t (:foreground ,zenburn-bg+3)))) - `(newsticker-statistics-face ((t (:foreground ,zenburn-fg)))) - `(newsticker-treeview-face ((t (:foreground ,zenburn-fg)))) - `(newsticker-treeview-immortal-face ((t (:foreground ,zenburn-green)))) - `(newsticker-treeview-listwindow-face ((t (:foreground ,zenburn-fg)))) - `(newsticker-treeview-new-face ((t (:foreground ,zenburn-blue :weight bold)))) - `(newsticker-treeview-obsolete-face ((t (:foreground ,zenburn-red)))) - `(newsticker-treeview-old-face ((t (:foreground ,zenburn-bg+3)))) - `(newsticker-treeview-selection-face ((t (:background ,zenburn-bg-1 :foreground ,zenburn-yellow)))) -;;;; Third-party -;;;;; ace-jump - `(ace-jump-face-background - ((t (:foreground ,zenburn-fg-1 :background ,zenburn-bg :inverse-video nil)))) - `(ace-jump-face-foreground - ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg :inverse-video nil)))) -;;;;; anzu - `(anzu-mode-line ((t (:foreground ,zenburn-cyan :weight bold)))) -;;;;; full-ack - `(ack-separator ((t (:foreground ,zenburn-fg)))) - `(ack-file ((t (:foreground ,zenburn-blue)))) - `(ack-line ((t (:foreground ,zenburn-yellow)))) - `(ack-match ((t (:foreground ,zenburn-orange :background ,zenburn-bg-1 :weight bold)))) -;;;;; auctex - `(font-latex-bold-face ((t (:inherit bold)))) - `(font-latex-warning-face ((t (:foreground nil :inherit font-lock-warning-face)))) - `(font-latex-sectioning-5-face ((t (:foreground ,zenburn-red :weight bold )))) - `(font-latex-sedate-face ((t (:foreground ,zenburn-yellow)))) - `(font-latex-italic-face ((t (:foreground ,zenburn-cyan :slant italic)))) - `(font-latex-string-face ((t (:inherit ,font-lock-string-face)))) - `(font-latex-math-face ((t (:foreground ,zenburn-orange)))) -;;;;; auto-complete - `(ac-candidate-face ((t (:background ,zenburn-bg+3 :foreground ,zenburn-bg-2)))) - `(ac-selection-face ((t (:background ,zenburn-blue-4 :foreground ,zenburn-fg)))) - `(popup-tip-face ((t (:background ,zenburn-yellow-2 :foreground ,zenburn-bg-2)))) - `(popup-scroll-bar-foreground-face ((t (:background ,zenburn-blue-5)))) - `(popup-scroll-bar-background-face ((t (:background ,zenburn-bg-1)))) - `(popup-isearch-match ((t (:background ,zenburn-bg :foreground ,zenburn-fg)))) -;;;;; android mode - `(android-mode-debug-face ((t (:foreground ,zenburn-green+1)))) - `(android-mode-error-face ((t (:foreground ,zenburn-orange :weight bold)))) - `(android-mode-info-face ((t (:foreground ,zenburn-fg)))) - `(android-mode-verbose-face ((t (:foreground ,zenburn-green)))) - `(android-mode-warning-face ((t (:foreground ,zenburn-yellow)))) -;;;;; bm - `(bm-face ((t (:background ,zenburn-yellow-1 :foreground ,zenburn-bg)))) - `(bm-fringe-face ((t (:background ,zenburn-yellow-1 :foreground ,zenburn-bg)))) - `(bm-fringe-persistent-face ((t (:background ,zenburn-green-1 :foreground ,zenburn-bg)))) - `(bm-persistent-face ((t (:background ,zenburn-green-1 :foreground ,zenburn-bg)))) -;;;;; clojure-test-mode - `(clojure-test-failure-face ((t (:foreground ,zenburn-orange :weight bold :underline t)))) - `(clojure-test-error-face ((t (:foreground ,zenburn-red :weight bold :underline t)))) - `(clojure-test-success-face ((t (:foreground ,zenburn-green+1 :weight bold :underline t)))) -;;;;; coq - `(coq-solve-tactics-face ((t (:foreground nil :inherit font-lock-constant-face)))) -;;;;; ctable - `(ctbl:face-cell-select ((t (:background ,zenburn-blue :foreground ,zenburn-bg)))) - `(ctbl:face-continue-bar ((t (:background ,zenburn-bg-05 :foreground ,zenburn-bg)))) - `(ctbl:face-row-select ((t (:background ,zenburn-cyan :foreground ,zenburn-bg)))) -;;;;; diff - `(diff-added ((,class (:foreground ,zenburn-green+4 :background nil)) - (t (:foreground ,zenburn-green-1 :background nil)))) - `(diff-changed ((t (:foreground ,zenburn-yellow)))) - `(diff-removed ((,class (:foreground ,zenburn-red :background nil)) - (t (:foreground ,zenburn-red-3 :background nil)))) - `(diff-refine-added ((t :inherit diff-added :weight bold))) - `(diff-refine-change ((t :inherit diff-changed :weight bold))) - `(diff-refine-removed ((t :inherit diff-removed :weight bold))) - `(diff-header ((,class (:background ,zenburn-bg+2)) - (t (:background ,zenburn-fg :foreground ,zenburn-bg)))) - `(diff-file-header - ((,class (:background ,zenburn-bg+2 :foreground ,zenburn-fg :bold t)) - (t (:background ,zenburn-fg :foreground ,zenburn-bg :bold t)))) -;;;;; dired+ - `(diredp-display-msg ((t (:foreground ,zenburn-blue)))) - `(diredp-compressed-file-suffix ((t (:foreground ,zenburn-orange)))) - `(diredp-date-time ((t (:foreground ,zenburn-magenta)))) - `(diredp-deletion ((t (:foreground ,zenburn-yellow)))) - `(diredp-deletion-file-name ((t (:foreground ,zenburn-red)))) - `(diredp-dir-heading ((t (:foreground ,zenburn-blue :background ,zenburn-bg-1)))) - `(diredp-dir-priv ((t (:foreground ,zenburn-cyan)))) - `(diredp-exec-priv ((t (:foreground ,zenburn-red)))) - `(diredp-executable-tag ((t (:foreground ,zenburn-green+1)))) - `(diredp-file-name ((t (:foreground ,zenburn-blue)))) - `(diredp-file-suffix ((t (:foreground ,zenburn-green)))) - `(diredp-flag-mark ((t (:foreground ,zenburn-yellow)))) - `(diredp-flag-mark-line ((t (:foreground ,zenburn-orange)))) - `(diredp-ignored-file-name ((t (:foreground ,zenburn-red)))) - `(diredp-link-priv ((t (:foreground ,zenburn-yellow)))) - `(diredp-mode-line-flagged ((t (:foreground ,zenburn-yellow)))) - `(diredp-mode-line-marked ((t (:foreground ,zenburn-orange)))) - `(diredp-no-priv ((t (:foreground ,zenburn-fg)))) - `(diredp-number ((t (:foreground ,zenburn-green+1)))) - `(diredp-other-priv ((t (:foreground ,zenburn-yellow-1)))) - `(diredp-rare-priv ((t (:foreground ,zenburn-red-1)))) - `(diredp-read-priv ((t (:foreground ,zenburn-green-1)))) - `(diredp-symlink ((t (:foreground ,zenburn-yellow)))) - `(diredp-write-priv ((t (:foreground ,zenburn-magenta)))) -;;;;; ediff - `(ediff-current-diff-A ((t (:foreground ,zenburn-fg :background ,zenburn-red-4)))) - `(ediff-current-diff-Ancestor ((t (:foreground ,zenburn-fg :background ,zenburn-red-4)))) - `(ediff-current-diff-B ((t (:foreground ,zenburn-fg :background ,zenburn-green-1)))) - `(ediff-current-diff-C ((t (:foreground ,zenburn-fg :background ,zenburn-blue-5)))) - `(ediff-even-diff-A ((t (:background ,zenburn-bg+1)))) - `(ediff-even-diff-Ancestor ((t (:background ,zenburn-bg+1)))) - `(ediff-even-diff-B ((t (:background ,zenburn-bg+1)))) - `(ediff-even-diff-C ((t (:background ,zenburn-bg+1)))) - `(ediff-fine-diff-A ((t (:foreground ,zenburn-fg :background ,zenburn-red-2 :weight bold)))) - `(ediff-fine-diff-Ancestor ((t (:foreground ,zenburn-fg :background ,zenburn-red-2 weight bold)))) - `(ediff-fine-diff-B ((t (:foreground ,zenburn-fg :background ,zenburn-green :weight bold)))) - `(ediff-fine-diff-C ((t (:foreground ,zenburn-fg :background ,zenburn-blue-3 :weight bold )))) - `(ediff-odd-diff-A ((t (:background ,zenburn-bg+2)))) - `(ediff-odd-diff-Ancestor ((t (:background ,zenburn-bg+2)))) - `(ediff-odd-diff-B ((t (:background ,zenburn-bg+2)))) - `(ediff-odd-diff-C ((t (:background ,zenburn-bg+2)))) -;;;;; ert - `(ert-test-result-expected ((t (:foreground ,zenburn-green+4 :background ,zenburn-bg)))) - `(ert-test-result-unexpected ((t (:foreground ,zenburn-red :background ,zenburn-bg)))) -;;;;; eshell - `(eshell-prompt ((t (:foreground ,zenburn-yellow :weight bold)))) - `(eshell-ls-archive ((t (:foreground ,zenburn-red-1 :weight bold)))) - `(eshell-ls-backup ((t (:inherit font-lock-comment-face)))) - `(eshell-ls-clutter ((t (:inherit font-lock-comment-face)))) - `(eshell-ls-directory ((t (:foreground ,zenburn-blue+1 :weight bold)))) - `(eshell-ls-executable ((t (:foreground ,zenburn-red+1 :weight bold)))) - `(eshell-ls-unreadable ((t (:foreground ,zenburn-fg)))) - `(eshell-ls-missing ((t (:inherit font-lock-warning-face)))) - `(eshell-ls-product ((t (:inherit font-lock-doc-face)))) - `(eshell-ls-special ((t (:foreground ,zenburn-yellow :weight bold)))) - `(eshell-ls-symlink ((t (:foreground ,zenburn-cyan :weight bold)))) -;;;;; flx - `(flx-highlight-face ((t (:foreground ,zenburn-green+2 :weight bold)))) -;;;;; flycheck - `(flycheck-error - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-red-1) :inherit unspecified)) - (t (:foreground ,zenburn-red-1 :weight bold :underline t)))) - `(flycheck-warning - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-yellow) :inherit unspecified)) - (t (:foreground ,zenburn-yellow :weight bold :underline t)))) - `(flycheck-info - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-cyan) :inherit unspecified)) - (t (:foreground ,zenburn-cyan :weight bold :underline t)))) - `(flycheck-fringe-error ((t (:foreground ,zenburn-red-1 :weight bold)))) - `(flycheck-fringe-warning ((t (:foreground ,zenburn-yellow :weight bold)))) - `(flycheck-fringe-info ((t (:foreground ,zenburn-cyan :weight bold)))) -;;;;; flymake - `(flymake-errline - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-red) - :inherit unspecified :foreground unspecified :background unspecified)) - (t (:foreground ,zenburn-red-1 :weight bold :underline t)))) - `(flymake-warnline - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-orange) - :inherit unspecified :foreground unspecified :background unspecified)) - (t (:foreground ,zenburn-orange :weight bold :underline t)))) - `(flymake-infoline - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-green) - :inherit unspecified :foreground unspecified :background unspecified)) - (t (:foreground ,zenburn-green-1 :weight bold :underline t)))) -;;;;; flyspell - `(flyspell-duplicate - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-orange) :inherit unspecified)) - (t (:foreground ,zenburn-orange :weight bold :underline t)))) - `(flyspell-incorrect - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-red) :inherit unspecified)) - (t (:foreground ,zenburn-red-1 :weight bold :underline t)))) -;;;;; erc - `(erc-action-face ((t (:inherit erc-default-face)))) - `(erc-bold-face ((t (:weight bold)))) - `(erc-current-nick-face ((t (:foreground ,zenburn-blue :weight bold)))) - `(erc-dangerous-host-face ((t (:inherit font-lock-warning-face)))) - `(erc-default-face ((t (:foreground ,zenburn-fg)))) - `(erc-direct-msg-face ((t (:inherit erc-default)))) - `(erc-error-face ((t (:inherit font-lock-warning-face)))) - `(erc-fool-face ((t (:inherit erc-default)))) - `(erc-highlight-face ((t (:inherit hover-highlight)))) - `(erc-input-face ((t (:foreground ,zenburn-yellow)))) - `(erc-keyword-face ((t (:foreground ,zenburn-blue :weight bold)))) - `(erc-nick-default-face ((t (:foreground ,zenburn-yellow :weight bold)))) - `(erc-my-nick-face ((t (:foreground ,zenburn-red :weight bold)))) - `(erc-nick-msg-face ((t (:inherit erc-default)))) - `(erc-notice-face ((t (:foreground ,zenburn-green)))) - `(erc-pal-face ((t (:foreground ,zenburn-orange :weight bold)))) - `(erc-prompt-face ((t (:foreground ,zenburn-orange :background ,zenburn-bg :weight bold)))) - `(erc-timestamp-face ((t (:foreground ,zenburn-green+4)))) - `(erc-underline-face ((t (:underline t)))) -;;;;; git-gutter - `(git-gutter:added ((t (:foreground ,zenburn-green :weight bold :inverse-video t)))) - `(git-gutter:deleted ((t (:foreground ,zenburn-red :weight bold :inverse-video t)))) - `(git-gutter:modified ((t (:foreground ,zenburn-magenta :weight bold :inverse-video t)))) - `(git-gutter:unchanged ((t (:foreground ,zenburn-fg :weight bold :inverse-video t)))) -;;;;; git-gutter-fr - `(git-gutter-fr:added ((t (:foreground ,zenburn-green :weight bold)))) - `(git-gutter-fr:deleted ((t (:foreground ,zenburn-red :weight bold)))) - `(git-gutter-fr:modified ((t (:foreground ,zenburn-magenta :weight bold)))) -;;;;; gnus - `(gnus-group-mail-1 ((t (:bold t :inherit gnus-group-mail-1-empty)))) - `(gnus-group-mail-1-empty ((t (:inherit gnus-group-news-1-empty)))) - `(gnus-group-mail-2 ((t (:bold t :inherit gnus-group-mail-2-empty)))) - `(gnus-group-mail-2-empty ((t (:inherit gnus-group-news-2-empty)))) - `(gnus-group-mail-3 ((t (:bold t :inherit gnus-group-mail-3-empty)))) - `(gnus-group-mail-3-empty ((t (:inherit gnus-group-news-3-empty)))) - `(gnus-group-mail-4 ((t (:bold t :inherit gnus-group-mail-4-empty)))) - `(gnus-group-mail-4-empty ((t (:inherit gnus-group-news-4-empty)))) - `(gnus-group-mail-5 ((t (:bold t :inherit gnus-group-mail-5-empty)))) - `(gnus-group-mail-5-empty ((t (:inherit gnus-group-news-5-empty)))) - `(gnus-group-mail-6 ((t (:bold t :inherit gnus-group-mail-6-empty)))) - `(gnus-group-mail-6-empty ((t (:inherit gnus-group-news-6-empty)))) - `(gnus-group-mail-low ((t (:bold t :inherit gnus-group-mail-low-empty)))) - `(gnus-group-mail-low-empty ((t (:inherit gnus-group-news-low-empty)))) - `(gnus-group-news-1 ((t (:bold t :inherit gnus-group-news-1-empty)))) - `(gnus-group-news-2 ((t (:bold t :inherit gnus-group-news-2-empty)))) - `(gnus-group-news-3 ((t (:bold t :inherit gnus-group-news-3-empty)))) - `(gnus-group-news-4 ((t (:bold t :inherit gnus-group-news-4-empty)))) - `(gnus-group-news-5 ((t (:bold t :inherit gnus-group-news-5-empty)))) - `(gnus-group-news-6 ((t (:bold t :inherit gnus-group-news-6-empty)))) - `(gnus-group-news-low ((t (:bold t :inherit gnus-group-news-low-empty)))) - `(gnus-header-content ((t (:inherit message-header-other)))) - `(gnus-header-from ((t (:inherit message-header-from)))) - `(gnus-header-name ((t (:inherit message-header-name)))) - `(gnus-header-newsgroups ((t (:inherit message-header-other)))) - `(gnus-header-subject ((t (:inherit message-header-subject)))) - `(gnus-summary-cancelled ((t (:foreground ,zenburn-orange)))) - `(gnus-summary-high-ancient ((t (:foreground ,zenburn-blue)))) - `(gnus-summary-high-read ((t (:foreground ,zenburn-green :weight bold)))) - `(gnus-summary-high-ticked ((t (:foreground ,zenburn-orange :weight bold)))) - `(gnus-summary-high-unread ((t (:foreground ,zenburn-fg :weight bold)))) - `(gnus-summary-low-ancient ((t (:foreground ,zenburn-blue)))) - `(gnus-summary-low-read ((t (:foreground ,zenburn-green)))) - `(gnus-summary-low-ticked ((t (:foreground ,zenburn-orange :weight bold)))) - `(gnus-summary-low-unread ((t (:foreground ,zenburn-fg)))) - `(gnus-summary-normal-ancient ((t (:foreground ,zenburn-blue)))) - `(gnus-summary-normal-read ((t (:foreground ,zenburn-green)))) - `(gnus-summary-normal-ticked ((t (:foreground ,zenburn-orange :weight bold)))) - `(gnus-summary-normal-unread ((t (:foreground ,zenburn-fg)))) - `(gnus-summary-selected ((t (:foreground ,zenburn-yellow :weight bold)))) - `(gnus-cite-1 ((t (:foreground ,zenburn-blue)))) - `(gnus-cite-10 ((t (:foreground ,zenburn-yellow-1)))) - `(gnus-cite-11 ((t (:foreground ,zenburn-yellow)))) - `(gnus-cite-2 ((t (:foreground ,zenburn-blue-1)))) - `(gnus-cite-3 ((t (:foreground ,zenburn-blue-2)))) - `(gnus-cite-4 ((t (:foreground ,zenburn-green+2)))) - `(gnus-cite-5 ((t (:foreground ,zenburn-green+1)))) - `(gnus-cite-6 ((t (:foreground ,zenburn-green)))) - `(gnus-cite-7 ((t (:foreground ,zenburn-red)))) - `(gnus-cite-8 ((t (:foreground ,zenburn-red-1)))) - `(gnus-cite-9 ((t (:foreground ,zenburn-red-2)))) - `(gnus-group-news-1-empty ((t (:foreground ,zenburn-yellow)))) - `(gnus-group-news-2-empty ((t (:foreground ,zenburn-green+3)))) - `(gnus-group-news-3-empty ((t (:foreground ,zenburn-green+1)))) - `(gnus-group-news-4-empty ((t (:foreground ,zenburn-blue-2)))) - `(gnus-group-news-5-empty ((t (:foreground ,zenburn-blue-3)))) - `(gnus-group-news-6-empty ((t (:foreground ,zenburn-bg+2)))) - `(gnus-group-news-low-empty ((t (:foreground ,zenburn-bg+2)))) - `(gnus-signature ((t (:foreground ,zenburn-yellow)))) - `(gnus-x ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) -;;;;; guide-key - `(guide-key/highlight-command-face ((t (:foreground ,zenburn-blue)))) - `(guide-key/key-face ((t (:foreground ,zenburn-green)))) - `(guide-key/prefix-command-face ((t (:foreground ,zenburn-green+1)))) -;;;;; helm - `(helm-header - ((t (:foreground ,zenburn-green - :background ,zenburn-bg - :underline nil - :box nil)))) - `(helm-source-header - ((t (:foreground ,zenburn-yellow - :background ,zenburn-bg-1 - :underline nil - :weight bold - :box (:line-width -1 :style released-button))))) - `(helm-selection ((t (:background ,zenburn-bg+1 :underline nil)))) - `(helm-selection-line ((t (:background ,zenburn-bg+1)))) - `(helm-visible-mark ((t (:foreground ,zenburn-bg :background ,zenburn-yellow-2)))) - `(helm-candidate-number ((t (:foreground ,zenburn-green+4 :background ,zenburn-bg-1)))) - `(helm-separator ((t (:foreground ,zenburn-red :background ,zenburn-bg)))) - `(helm-time-zone-current ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg)))) - `(helm-time-zone-home ((t (:foreground ,zenburn-red :background ,zenburn-bg)))) - `(helm-bookmark-addressbook ((t (:foreground ,zenburn-orange :background ,zenburn-bg)))) - `(helm-bookmark-directory ((t (:foreground nil :background nil :inherit helm-ff-directory)))) - `(helm-bookmark-file ((t (:foreground nil :background nil :inherit helm-ff-file)))) - `(helm-bookmark-gnus ((t (:foreground ,zenburn-magenta :background ,zenburn-bg)))) - `(helm-bookmark-info ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg)))) - `(helm-bookmark-man ((t (:foreground ,zenburn-yellow :background ,zenburn-bg)))) - `(helm-bookmark-w3m ((t (:foreground ,zenburn-magenta :background ,zenburn-bg)))) - `(helm-buffer-not-saved ((t (:foreground ,zenburn-red :background ,zenburn-bg)))) - `(helm-buffer-process ((t (:foreground ,zenburn-cyan :background ,zenburn-bg)))) - `(helm-buffer-saved-out ((t (:foreground ,zenburn-fg :background ,zenburn-bg)))) - `(helm-buffer-size ((t (:foreground ,zenburn-fg-1 :background ,zenburn-bg)))) - `(helm-ff-directory ((t (:foreground ,zenburn-cyan :background ,zenburn-bg :weight bold)))) - `(helm-ff-file ((t (:foreground ,zenburn-fg :background ,zenburn-bg :weight normal)))) - `(helm-ff-executable ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg :weight normal)))) - `(helm-ff-invalid-symlink ((t (:foreground ,zenburn-red :background ,zenburn-bg :weight bold)))) - `(helm-ff-symlink ((t (:foreground ,zenburn-yellow :background ,zenburn-bg :weight bold)))) - `(helm-ff-prefix ((t (:foreground ,zenburn-bg :background ,zenburn-yellow :weight normal)))) - `(helm-grep-cmd-line ((t (:foreground ,zenburn-cyan :background ,zenburn-bg)))) - `(helm-grep-file ((t (:foreground ,zenburn-fg :background ,zenburn-bg)))) - `(helm-grep-finish ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg)))) - `(helm-grep-lineno ((t (:foreground ,zenburn-fg-1 :background ,zenburn-bg)))) - `(helm-grep-match ((t (:foreground nil :background nil :inherit helm-match)))) - `(helm-grep-running ((t (:foreground ,zenburn-red :background ,zenburn-bg)))) - `(helm-moccur-buffer ((t (:foreground ,zenburn-cyan :background ,zenburn-bg)))) - `(helm-mu-contacts-address-face ((t (:foreground ,zenburn-fg-1 :background ,zenburn-bg)))) - `(helm-mu-contacts-name-face ((t (:foreground ,zenburn-fg :background ,zenburn-bg)))) -;;;;; hl-line-mode - `(hl-line-face ((,class (:background ,zenburn-bg-05)) - (t :weight bold))) - `(hl-line ((,class (:background ,zenburn-bg-05)) ; old emacsen - (t :weight bold))) -;;;;; hl-sexp - `(hl-sexp-face ((,class (:background ,zenburn-bg+1)) - (t :weight bold))) -;;;;; ido-mode - `(ido-first-match ((t (:foreground ,zenburn-yellow :weight bold)))) - `(ido-only-match ((t (:foreground ,zenburn-orange :weight bold)))) - `(ido-subdir ((t (:foreground ,zenburn-yellow)))) - `(ido-indicator ((t (:foreground ,zenburn-yellow :background ,zenburn-red-4)))) -;;;;; iedit-mode - `(iedit-occurrence ((t (:background ,zenburn-bg+2 :weight bold)))) -;;;;; js2-mode - `(js2-warning ((t (:underline ,zenburn-orange)))) - `(js2-error ((t (:foreground ,zenburn-red :weight bold)))) - `(js2-jsdoc-tag ((t (:foreground ,zenburn-green-1)))) - `(js2-jsdoc-type ((t (:foreground ,zenburn-green+2)))) - `(js2-jsdoc-value ((t (:foreground ,zenburn-green+3)))) - `(js2-function-param ((t (:foreground, zenburn-green+3)))) - `(js2-external-variable ((t (:foreground ,zenburn-orange)))) -;;;;; jabber-mode - `(jabber-roster-user-away ((t (:foreground ,zenburn-green+2)))) - `(jabber-roster-user-online ((t (:foreground ,zenburn-blue-1)))) - `(jabber-roster-user-dnd ((t (:foreground ,zenburn-red+1)))) - `(jabber-rare-time-face ((t (:foreground ,zenburn-green+1)))) - `(jabber-chat-prompt-local ((t (:foreground ,zenburn-blue-1)))) - `(jabber-chat-prompt-foreign ((t (:foreground ,zenburn-red+1)))) - `(jabber-activity-face((t (:foreground ,zenburn-red+1)))) - `(jabber-activity-personal-face ((t (:foreground ,zenburn-blue+1)))) - `(jabber-title-small ((t (:height 1.1 :weight bold)))) - `(jabber-title-medium ((t (:height 1.2 :weight bold)))) - `(jabber-title-large ((t (:height 1.3 :weight bold)))) -;;;;; ledger-mode - `(ledger-font-payee-uncleared-face ((t (:foreground ,zenburn-red-1 :weight bold)))) - `(ledger-font-payee-cleared-face ((t (:foreground ,zenburn-fg :weight normal)))) - `(ledger-font-xact-highlight-face ((t (:background ,zenburn-bg+1)))) - `(ledger-font-pending-face ((t (:foreground ,zenburn-orange weight: normal)))) - `(ledger-font-other-face ((t (:foreground ,zenburn-fg)))) - `(ledger-font-posting-account-face ((t (:foreground ,zenburn-blue-1)))) - `(ledger-font-posting-account-cleared-face ((t (:foreground ,zenburn-fg)))) - `(ledger-font-posting-account-pending-face ((t (:foreground ,zenburn-orange)))) - `(ledger-font-posting-amount-face ((t (:foreground ,zenburn-orange)))) - `(ledger-font-posting-account-pending-face ((t (:foreground ,zenburn-orange)))) - `(ledger-occur-narrowed-face ((t (:foreground ,zenburn-fg-1 :invisible t)))) - `(ledger-occur-xact-face ((t (:background ,zenburn-bg+1)))) - `(ledger-font-comment-face ((t (:foreground ,zenburn-green)))) - `(ledger-font-reconciler-uncleared-face ((t (:foreground ,zenburn-red-1 :weight bold)))) - `(ledger-font-reconciler-cleared-face ((t (:foreground ,zenburn-fg :weight normal)))) - `(ledger-font-reconciler-pending-face ((t (:foreground ,zenburn-orange :weight normal)))) - `(ledger-font-report-clickable-face ((t (:foreground ,zenburn-orange :weight normal)))) -;;;;; linum-mode - `(linum ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg)))) -;;;;; macrostep - `(macrostep-gensym-1 - ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg-1)))) - `(macrostep-gensym-2 - ((t (:foreground ,zenburn-red+1 :background ,zenburn-bg-1)))) - `(macrostep-gensym-3 - ((t (:foreground ,zenburn-blue+1 :background ,zenburn-bg-1)))) - `(macrostep-gensym-4 - ((t (:foreground ,zenburn-magenta :background ,zenburn-bg-1)))) - `(macrostep-gensym-5 - ((t (:foreground ,zenburn-yellow :background ,zenburn-bg-1)))) - `(macrostep-expansion-highlight-face - ((t (:inherit highlight)))) - `(macrostep-macro-face - ((t (:underline t)))) -;;;;; magit - `(magit-section-title ((t (:foreground ,zenburn-yellow :weight bold)))) - `(magit-branch ((t (:foreground ,zenburn-orange :weight bold)))) - `(magit-item-highlight ((t (:background ,zenburn-bg+1 :bold nil)))) -;;;;; egg - `(egg-text-base ((t (:foreground ,zenburn-fg)))) - `(egg-help-header-1 ((t (:foreground ,zenburn-yellow)))) - `(egg-help-header-2 ((t (:foreground ,zenburn-green+3)))) - `(egg-branch ((t (:foreground ,zenburn-yellow)))) - `(egg-branch-mono ((t (:foreground ,zenburn-yellow)))) - `(egg-term ((t (:foreground ,zenburn-yellow)))) - `(egg-diff-add ((t (:foreground ,zenburn-green+4)))) - `(egg-diff-del ((t (:foreground ,zenburn-red+1)))) - `(egg-diff-file-header ((t (:foreground ,zenburn-yellow-2)))) - `(egg-section-title ((t (:foreground ,zenburn-yellow)))) - `(egg-stash-mono ((t (:foreground ,zenburn-green+4)))) -;;;;; message-mode - `(message-cited-text ((t (:inherit font-lock-comment-face)))) - `(message-header-name ((t (:foreground ,zenburn-green+1)))) - `(message-header-other ((t (:foreground ,zenburn-green)))) - `(message-header-to ((t (:foreground ,zenburn-yellow :weight bold)))) - `(message-header-from ((t (:foreground ,zenburn-yellow :weight bold)))) - `(message-header-cc ((t (:foreground ,zenburn-yellow :weight bold)))) - `(message-header-newsgroups ((t (:foreground ,zenburn-yellow :weight bold)))) - `(message-header-subject ((t (:foreground ,zenburn-orange :weight bold)))) - `(message-header-xheader ((t (:foreground ,zenburn-green)))) - `(message-mml ((t (:foreground ,zenburn-yellow :weight bold)))) - `(message-separator ((t (:inherit font-lock-comment-face)))) -;;;;; mew - `(mew-face-header-subject ((t (:foreground ,zenburn-orange)))) - `(mew-face-header-from ((t (:foreground ,zenburn-yellow)))) - `(mew-face-header-date ((t (:foreground ,zenburn-green)))) - `(mew-face-header-to ((t (:foreground ,zenburn-red)))) - `(mew-face-header-key ((t (:foreground ,zenburn-green)))) - `(mew-face-header-private ((t (:foreground ,zenburn-green)))) - `(mew-face-header-important ((t (:foreground ,zenburn-blue)))) - `(mew-face-header-marginal ((t (:foreground ,zenburn-fg :weight bold)))) - `(mew-face-header-warning ((t (:foreground ,zenburn-red)))) - `(mew-face-header-xmew ((t (:foreground ,zenburn-green)))) - `(mew-face-header-xmew-bad ((t (:foreground ,zenburn-red)))) - `(mew-face-body-url ((t (:foreground ,zenburn-orange)))) - `(mew-face-body-comment ((t (:foreground ,zenburn-fg :slant italic)))) - `(mew-face-body-cite1 ((t (:foreground ,zenburn-green)))) - `(mew-face-body-cite2 ((t (:foreground ,zenburn-blue)))) - `(mew-face-body-cite3 ((t (:foreground ,zenburn-orange)))) - `(mew-face-body-cite4 ((t (:foreground ,zenburn-yellow)))) - `(mew-face-body-cite5 ((t (:foreground ,zenburn-red)))) - `(mew-face-mark-review ((t (:foreground ,zenburn-blue)))) - `(mew-face-mark-escape ((t (:foreground ,zenburn-green)))) - `(mew-face-mark-delete ((t (:foreground ,zenburn-red)))) - `(mew-face-mark-unlink ((t (:foreground ,zenburn-yellow)))) - `(mew-face-mark-refile ((t (:foreground ,zenburn-green)))) - `(mew-face-mark-unread ((t (:foreground ,zenburn-red-2)))) - `(mew-face-eof-message ((t (:foreground ,zenburn-green)))) - `(mew-face-eof-part ((t (:foreground ,zenburn-yellow)))) -;;;;; mic-paren - `(paren-face-match ((t (:foreground ,zenburn-cyan :background ,zenburn-bg :weight bold)))) - `(paren-face-mismatch ((t (:foreground ,zenburn-bg :background ,zenburn-magenta :weight bold)))) - `(paren-face-no-match ((t (:foreground ,zenburn-bg :background ,zenburn-red :weight bold)))) -;;;;; mingus - `(mingus-directory-face ((t (:foreground ,zenburn-blue)))) - `(mingus-pausing-face ((t (:foreground ,zenburn-magenta)))) - `(mingus-playing-face ((t (:foreground ,zenburn-cyan)))) - `(mingus-playlist-face ((t (:foreground ,zenburn-cyan )))) - `(mingus-song-file-face ((t (:foreground ,zenburn-yellow)))) - `(mingus-stopped-face ((t (:foreground ,zenburn-red)))) -;;;;; nav - `(nav-face-heading ((t (:foreground ,zenburn-yellow)))) - `(nav-face-button-num ((t (:foreground ,zenburn-cyan)))) - `(nav-face-dir ((t (:foreground ,zenburn-green)))) - `(nav-face-hdir ((t (:foreground ,zenburn-red)))) - `(nav-face-file ((t (:foreground ,zenburn-fg)))) - `(nav-face-hfile ((t (:foreground ,zenburn-red-4)))) -;;;;; mu4e - `(mu4e-cited-1-face ((t (:foreground ,zenburn-blue :slant italic)))) - `(mu4e-cited-2-face ((t (:foreground ,zenburn-green+2 :slant italic)))) - `(mu4e-cited-3-face ((t (:foreground ,zenburn-blue-2 :slant italic)))) - `(mu4e-cited-4-face ((t (:foreground ,zenburn-green :slant italic)))) - `(mu4e-cited-5-face ((t (:foreground ,zenburn-blue-4 :slant italic)))) - `(mu4e-cited-6-face ((t (:foreground ,zenburn-green-1 :slant italic)))) - `(mu4e-cited-7-face ((t (:foreground ,zenburn-blue :slant italic)))) - `(mu4e-replied-face ((t (:foreground ,zenburn-bg+3)))) - `(mu4e-trashed-face ((t (:foreground ,zenburn-bg+3 :strike-through t)))) -;;;;; mumamo - `(mumamo-background-chunk-major ((t (:background nil)))) - `(mumamo-background-chunk-submode1 ((t (:background ,zenburn-bg-1)))) - `(mumamo-background-chunk-submode2 ((t (:background ,zenburn-bg+2)))) - `(mumamo-background-chunk-submode3 ((t (:background ,zenburn-bg+3)))) - `(mumamo-background-chunk-submode4 ((t (:background ,zenburn-bg+1)))) -;;;;; org-mode - `(org-agenda-date-today - ((t (:foreground ,zenburn-fg+1 :slant italic :weight bold))) t) - `(org-agenda-structure - ((t (:inherit font-lock-comment-face)))) - `(org-archived ((t (:foreground ,zenburn-fg :weight bold)))) - `(org-checkbox ((t (:background ,zenburn-bg+2 :foreground ,zenburn-fg+1 - :box (:line-width 1 :style released-button))))) - `(org-date ((t (:foreground ,zenburn-blue :underline t)))) - `(org-deadline-announce ((t (:foreground ,zenburn-red-1)))) - `(org-done ((t (:bold t :weight bold :foreground ,zenburn-green+3)))) - `(org-formula ((t (:foreground ,zenburn-yellow-2)))) - `(org-headline-done ((t (:foreground ,zenburn-green+3)))) - `(org-hide ((t (:foreground ,zenburn-bg-1)))) - `(org-level-1 ((t (:foreground ,zenburn-orange)))) - `(org-level-2 ((t (:foreground ,zenburn-green+4)))) - `(org-level-3 ((t (:foreground ,zenburn-blue-1)))) - `(org-level-4 ((t (:foreground ,zenburn-yellow-2)))) - `(org-level-5 ((t (:foreground ,zenburn-cyan)))) - `(org-level-6 ((t (:foreground ,zenburn-green+2)))) - `(org-level-7 ((t (:foreground ,zenburn-red-4)))) - `(org-level-8 ((t (:foreground ,zenburn-blue-4)))) - `(org-link ((t (:foreground ,zenburn-yellow-2 :underline t)))) - `(org-scheduled ((t (:foreground ,zenburn-green+4)))) - `(org-scheduled-previously ((t (:foreground ,zenburn-red)))) - `(org-scheduled-today ((t (:foreground ,zenburn-blue+1)))) - `(org-sexp-date ((t (:foreground ,zenburn-blue+1 :underline t)))) - `(org-special-keyword ((t (:inherit font-lock-comment-face)))) - `(org-table ((t (:foreground ,zenburn-green+2)))) - `(org-tag ((t (:bold t :weight bold)))) - `(org-time-grid ((t (:foreground ,zenburn-orange)))) - `(org-todo ((t (:bold t :foreground ,zenburn-red :weight bold)))) - `(org-upcoming-deadline ((t (:inherit font-lock-keyword-face)))) - `(org-warning ((t (:bold t :foreground ,zenburn-red :weight bold :underline nil)))) - `(org-column ((t (:background ,zenburn-bg-1)))) - `(org-column-title ((t (:background ,zenburn-bg-1 :underline t :weight bold)))) - `(org-mode-line-clock ((t (:foreground ,zenburn-fg :background ,zenburn-bg-1)))) - `(org-mode-line-clock-overrun ((t (:foreground ,zenburn-bg :background ,zenburn-red-1)))) - `(org-ellipsis ((t (:foreground ,zenburn-yellow-1 :underline t)))) - `(org-footnote ((t (:foreground ,zenburn-cyan :underline t)))) -;;;;; outline - `(outline-1 ((t (:foreground ,zenburn-orange)))) - `(outline-2 ((t (:foreground ,zenburn-green+4)))) - `(outline-3 ((t (:foreground ,zenburn-blue-1)))) - `(outline-4 ((t (:foreground ,zenburn-yellow-2)))) - `(outline-5 ((t (:foreground ,zenburn-cyan)))) - `(outline-6 ((t (:foreground ,zenburn-green+2)))) - `(outline-7 ((t (:foreground ,zenburn-red-4)))) - `(outline-8 ((t (:foreground ,zenburn-blue-4)))) -;;;;; p4 - `(p4-depot-added-face ((t :inherit diff-added))) - `(p4-depot-branch-op-face ((t :inherit diff-changed))) - `(p4-depot-deleted-face ((t :inherit diff-removed))) - `(p4-depot-unmapped-face ((t :inherit diff-changed))) - `(p4-diff-change-face ((t :inherit diff-changed))) - `(p4-diff-del-face ((t :inherit diff-removed))) - `(p4-diff-file-face ((t :inherit diff-file-header))) - `(p4-diff-head-face ((t :inherit diff-header))) - `(p4-diff-ins-face ((t :inherit diff-added))) -;;;;; perspective - `(persp-selected-face ((t (:foreground ,zenburn-yellow-2 :inherit mode-line)))) -;;;;; powerline - `(powerline-active1 ((t (:background ,zenburn-bg-05 :inherit mode-line)))) - `(powerline-active2 ((t (:background ,zenburn-bg+2 :inherit mode-line)))) - `(powerline-inactive1 ((t (:background ,zenburn-bg+1 :inherit mode-line-inactive)))) - `(powerline-inactive2 ((t (:background ,zenburn-bg+3 :inherit mode-line-inactive)))) -;;;;; proofgeneral - `(proof-active-area-face ((t (:underline t)))) - `(proof-boring-face ((t (:foreground ,zenburn-fg :background ,zenburn-bg+2)))) - `(proof-command-mouse-highlight-face ((t (:inherit proof-mouse-highlight-face)))) - `(proof-debug-message-face ((t (:inherit proof-boring-face)))) - `(proof-declaration-name-face ((t (:inherit font-lock-keyword-face :foreground nil)))) - `(proof-eager-annotation-face ((t (:foreground ,zenburn-bg :background ,zenburn-orange)))) - `(proof-error-face ((t (:foreground ,zenburn-fg :background ,zenburn-red-4)))) - `(proof-highlight-dependency-face ((t (:foreground ,zenburn-bg :background ,zenburn-yellow-1)))) - `(proof-highlight-dependent-face ((t (:foreground ,zenburn-bg :background ,zenburn-orange)))) - `(proof-locked-face ((t (:background ,zenburn-blue-5)))) - `(proof-mouse-highlight-face ((t (:foreground ,zenburn-bg :background ,zenburn-orange)))) - `(proof-queue-face ((t (:background ,zenburn-red-4)))) - `(proof-region-mouse-highlight-face ((t (:inherit proof-mouse-highlight-face)))) - `(proof-script-highlight-error-face ((t (:background ,zenburn-red-2)))) - `(proof-tacticals-name-face ((t (:inherit font-lock-constant-face :foreground nil :background ,zenburn-bg)))) - `(proof-tactics-name-face ((t (:inherit font-lock-constant-face :foreground nil :background ,zenburn-bg)))) - `(proof-warning-face ((t (:foreground ,zenburn-bg :background ,zenburn-yellow-1)))) -;;;;; rainbow-delimiters - `(rainbow-delimiters-depth-1-face ((t (:foreground ,zenburn-fg)))) - `(rainbow-delimiters-depth-2-face ((t (:foreground ,zenburn-green+4)))) - `(rainbow-delimiters-depth-3-face ((t (:foreground ,zenburn-yellow-2)))) - `(rainbow-delimiters-depth-4-face ((t (:foreground ,zenburn-cyan)))) - `(rainbow-delimiters-depth-5-face ((t (:foreground ,zenburn-green+2)))) - `(rainbow-delimiters-depth-6-face ((t (:foreground ,zenburn-blue+1)))) - `(rainbow-delimiters-depth-7-face ((t (:foreground ,zenburn-yellow-1)))) - `(rainbow-delimiters-depth-8-face ((t (:foreground ,zenburn-green+1)))) - `(rainbow-delimiters-depth-9-face ((t (:foreground ,zenburn-blue-2)))) - `(rainbow-delimiters-depth-10-face ((t (:foreground ,zenburn-orange)))) - `(rainbow-delimiters-depth-11-face ((t (:foreground ,zenburn-green)))) - `(rainbow-delimiters-depth-12-face ((t (:foreground ,zenburn-blue-5)))) -;;;;; rcirc - `(rcirc-my-nick ((t (:foreground ,zenburn-blue)))) - `(rcirc-other-nick ((t (:foreground ,zenburn-orange)))) - `(rcirc-bright-nick ((t (:foreground ,zenburn-blue+1)))) - `(rcirc-dim-nick ((t (:foreground ,zenburn-blue-2)))) - `(rcirc-server ((t (:foreground ,zenburn-green)))) - `(rcirc-server-prefix ((t (:foreground ,zenburn-green+1)))) - `(rcirc-timestamp ((t (:foreground ,zenburn-green+2)))) - `(rcirc-nick-in-message ((t (:foreground ,zenburn-yellow)))) - `(rcirc-nick-in-message-full-line ((t (:bold t)))) - `(rcirc-prompt ((t (:foreground ,zenburn-yellow :bold t)))) - `(rcirc-track-nick ((t (:inverse-video t)))) - `(rcirc-track-keyword ((t (:bold t)))) - `(rcirc-url ((t (:bold t)))) - `(rcirc-keyword ((t (:foreground ,zenburn-yellow :bold t)))) -;;;;; rpm-mode - `(rpm-spec-dir-face ((t (:foreground ,zenburn-green)))) - `(rpm-spec-doc-face ((t (:foreground ,zenburn-green)))) - `(rpm-spec-ghost-face ((t (:foreground ,zenburn-red)))) - `(rpm-spec-macro-face ((t (:foreground ,zenburn-yellow)))) - `(rpm-spec-obsolete-tag-face ((t (:foreground ,zenburn-red)))) - `(rpm-spec-package-face ((t (:foreground ,zenburn-red)))) - `(rpm-spec-section-face ((t (:foreground ,zenburn-yellow)))) - `(rpm-spec-tag-face ((t (:foreground ,zenburn-blue)))) - `(rpm-spec-var-face ((t (:foreground ,zenburn-red)))) -;;;;; rst-mode - `(rst-level-1-face ((t (:foreground ,zenburn-orange)))) - `(rst-level-2-face ((t (:foreground ,zenburn-green+1)))) - `(rst-level-3-face ((t (:foreground ,zenburn-blue-1)))) - `(rst-level-4-face ((t (:foreground ,zenburn-yellow-2)))) - `(rst-level-5-face ((t (:foreground ,zenburn-cyan)))) - `(rst-level-6-face ((t (:foreground ,zenburn-green-1)))) -;;;;; sh-mode - `(sh-heredoc ((t (:foreground ,zenburn-yellow :bold t)))) - `(sh-quoted-exec ((t (:foreground ,zenburn-red)))) -;;;;; show-paren - `(show-paren-mismatch ((t (:foreground ,zenburn-red+1 :background ,zenburn-bg+3 :weight bold)))) - `(show-paren-match ((t (:background ,zenburn-bg+3 :weight bold)))) -;;;;; smartparens - `(sp-show-pair-mismatch-face ((t (:foreground ,zenburn-red+1 :background ,zenburn-bg+3 :weight bold)))) - `(sp-show-pair-match-face ((t (:background ,zenburn-bg+3 :weight bold)))) -;;;;; sml-mode-line - '(sml-modeline-end-face ((t :inherit default :width condensed))) -;;;;; SLIME - `(slime-repl-output-face ((t (:foreground ,zenburn-red)))) - `(slime-repl-inputed-output-face ((t (:foreground ,zenburn-green)))) - `(slime-error-face - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-red))) - (t - (:underline ,zenburn-red)))) - `(slime-warning-face - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-orange))) - (t - (:underline ,zenburn-orange)))) - `(slime-style-warning-face - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-yellow))) - (t - (:underline ,zenburn-yellow)))) - `(slime-note-face - ((((supports :underline (:style wave))) - (:underline (:style wave :color ,zenburn-green))) - (t - (:underline ,zenburn-green)))) - `(slime-highlight-face ((t (:inherit highlight)))) -;;;;; speedbar - `(speedbar-button-face ((t (:foreground ,zenburn-green+2)))) - `(speedbar-directory-face ((t (:foreground ,zenburn-cyan)))) - `(speedbar-file-face ((t (:foreground ,zenburn-fg)))) - `(speedbar-highlight-face ((t (:foreground ,zenburn-bg :background ,zenburn-green+2)))) - `(speedbar-selected-face ((t (:foreground ,zenburn-red)))) - `(speedbar-separator-face ((t (:foreground ,zenburn-bg :background ,zenburn-blue-1)))) - `(speedbar-tag-face ((t (:foreground ,zenburn-yellow)))) -;;;;; tabbar - `(tabbar-button ((t (:foreground ,zenburn-fg - :background ,zenburn-bg)))) - `(tabbar-selected ((t (:foreground ,zenburn-fg - :background ,zenburn-bg - :box (:line-width -1 :style pressed-button))))) - `(tabbar-unselected ((t (:foreground ,zenburn-fg - :background ,zenburn-bg+1 - :box (:line-width -1 :style released-button))))) -;;;;; term - `(term-color-black ((t (:foreground ,zenburn-bg - :background ,zenburn-bg-1)))) - `(term-color-red ((t (:foreground ,zenburn-red-2 - :background ,zenburn-red-4)))) - `(term-color-green ((t (:foreground ,zenburn-green - :background ,zenburn-green+2)))) - `(term-color-yellow ((t (:foreground ,zenburn-orange - :background ,zenburn-yellow)))) - `(term-color-blue ((t (:foreground ,zenburn-blue-1 - :background ,zenburn-blue-4)))) - `(term-color-magenta ((t (:foreground ,zenburn-magenta - :background ,zenburn-red)))) - `(term-color-cyan ((t (:foreground ,zenburn-cyan - :background ,zenburn-blue)))) - `(term-color-white ((t (:foreground ,zenburn-fg - :background ,zenburn-fg-1)))) - '(term-default-fg-color ((t (:inherit term-color-white)))) - '(term-default-bg-color ((t (:inherit term-color-black)))) -;;;;; undo-tree - `(undo-tree-visualizer-active-branch-face ((t (:foreground ,zenburn-fg+1 :weight bold)))) - `(undo-tree-visualizer-current-face ((t (:foreground ,zenburn-red-1 :weight bold)))) - `(undo-tree-visualizer-default-face ((t (:foreground ,zenburn-fg)))) - `(undo-tree-visualizer-register-face ((t (:foreground ,zenburn-yellow)))) - `(undo-tree-visualizer-unmodified-face ((t (:foreground ,zenburn-cyan)))) -;;;;; volatile-highlights - `(vhl/default-face ((t (:background ,zenburn-bg-05)))) -;;;;; emacs-w3m - `(w3m-anchor ((t (:foreground ,zenburn-yellow :underline t - :weight bold)))) - `(w3m-arrived-anchor ((t (:foreground ,zenburn-yellow-2 - :underline t :weight normal)))) - `(w3m-form ((t (:foreground ,zenburn-red-1 :underline t)))) - `(w3m-header-line-location-title ((t (:foreground ,zenburn-yellow - :underline t :weight bold)))) - '(w3m-history-current-url ((t (:inherit match)))) - `(w3m-lnum ((t (:foreground ,zenburn-green+2 :background ,zenburn-bg)))) - `(w3m-lnum-match ((t (:background ,zenburn-bg-1 - :foreground ,zenburn-orange - :weight bold)))) - `(w3m-lnum-minibuffer-prompt ((t (:foreground ,zenburn-yellow)))) -;;;;; web-mode - `(web-mode-builtin-face ((t (:inherit ,font-lock-builtin-face)))) - `(web-mode-comment-face ((t (:inherit ,font-lock-comment-face)))) - `(web-mode-constant-face ((t (:inherit ,font-lock-constant-face)))) - `(web-mode-css-at-rule-face ((t (:foreground ,zenburn-orange )))) - `(web-mode-css-prop-face ((t (:foreground ,zenburn-orange)))) - `(web-mode-css-pseudo-class-face ((t (:foreground ,zenburn-green+3 :weight bold)))) - `(web-mode-css-rule-face ((t (:foreground ,zenburn-blue)))) - `(web-mode-doctype-face ((t (:inherit ,font-lock-comment-face)))) - `(web-mode-folded-face ((t (:underline t)))) - `(web-mode-function-name-face ((t (:foreground ,zenburn-blue)))) - `(web-mode-html-attr-name-face ((t (:foreground ,zenburn-orange)))) - `(web-mode-html-attr-value-face ((t (:inherit ,font-lock-string-face)))) - `(web-mode-html-tag-face ((t (:foreground ,zenburn-cyan)))) - `(web-mode-keyword-face ((t (:inherit ,font-lock-keyword-face)))) - `(web-mode-preprocessor-face ((t (:inherit ,font-lock-preprocessor-face)))) - `(web-mode-string-face ((t (:inherit ,font-lock-string-face)))) - `(web-mode-type-face ((t (:inherit ,font-lock-type-face)))) - `(web-mode-variable-name-face ((t (:inherit ,font-lock-variable-name-face)))) - `(web-mode-server-background-face ((t (:background ,zenburn-bg)))) - `(web-mode-server-comment-face ((t (:inherit web-mode-comment-face)))) - `(web-mode-server-string-face ((t (:inherit web-mode-string-face)))) - `(web-mode-symbol-face ((t (:inherit font-lock-constant-face)))) - `(web-mode-warning-face ((t (:inherit font-lock-warning-face)))) - `(web-mode-whitespaces-face ((t (:background ,zenburn-red)))) -;;;;; whitespace-mode - `(whitespace-space ((t (:background ,zenburn-bg+1 :foreground ,zenburn-bg+1)))) - `(whitespace-hspace ((t (:background ,zenburn-bg+1 :foreground ,zenburn-bg+1)))) - `(whitespace-tab ((t (:background ,zenburn-red-1)))) - `(whitespace-newline ((t (:foreground ,zenburn-bg+1)))) - `(whitespace-trailing ((t (:background ,zenburn-red)))) - `(whitespace-line ((t (:background ,zenburn-bg :foreground ,zenburn-magenta)))) - `(whitespace-space-before-tab ((t (:background ,zenburn-orange :foreground ,zenburn-orange)))) - `(whitespace-indentation ((t (:background ,zenburn-yellow :foreground ,zenburn-red)))) - `(whitespace-empty ((t (:background ,zenburn-yellow)))) - `(whitespace-space-after-tab ((t (:background ,zenburn-yellow :foreground ,zenburn-red)))) -;;;;; wanderlust - `(wl-highlight-folder-few-face ((t (:foreground ,zenburn-red-2)))) - `(wl-highlight-folder-many-face ((t (:foreground ,zenburn-red-1)))) - `(wl-highlight-folder-path-face ((t (:foreground ,zenburn-orange)))) - `(wl-highlight-folder-unread-face ((t (:foreground ,zenburn-blue)))) - `(wl-highlight-folder-zero-face ((t (:foreground ,zenburn-fg)))) - `(wl-highlight-folder-unknown-face ((t (:foreground ,zenburn-blue)))) - `(wl-highlight-message-citation-header ((t (:foreground ,zenburn-red-1)))) - `(wl-highlight-message-cited-text-1 ((t (:foreground ,zenburn-red)))) - `(wl-highlight-message-cited-text-2 ((t (:foreground ,zenburn-green+2)))) - `(wl-highlight-message-cited-text-3 ((t (:foreground ,zenburn-blue)))) - `(wl-highlight-message-cited-text-4 ((t (:foreground ,zenburn-blue+1)))) - `(wl-highlight-message-header-contents-face ((t (:foreground ,zenburn-green)))) - `(wl-highlight-message-headers-face ((t (:foreground ,zenburn-red+1)))) - `(wl-highlight-message-important-header-contents ((t (:foreground ,zenburn-green+2)))) - `(wl-highlight-message-header-contents ((t (:foreground ,zenburn-green+1)))) - `(wl-highlight-message-important-header-contents2 ((t (:foreground ,zenburn-green+2)))) - `(wl-highlight-message-signature ((t (:foreground ,zenburn-green)))) - `(wl-highlight-message-unimportant-header-contents ((t (:foreground ,zenburn-fg)))) - `(wl-highlight-summary-answered-face ((t (:foreground ,zenburn-blue)))) - `(wl-highlight-summary-disposed-face ((t (:foreground ,zenburn-fg - :slant italic)))) - `(wl-highlight-summary-new-face ((t (:foreground ,zenburn-blue)))) - `(wl-highlight-summary-normal-face ((t (:foreground ,zenburn-fg)))) - `(wl-highlight-summary-thread-top-face ((t (:foreground ,zenburn-yellow)))) - `(wl-highlight-thread-indent-face ((t (:foreground ,zenburn-magenta)))) - `(wl-highlight-summary-refiled-face ((t (:foreground ,zenburn-fg)))) - `(wl-highlight-summary-displaying-face ((t (:underline t :weight bold)))) -;;;;; which-func-mode - `(which-func ((t (:foreground ,zenburn-green+4)))) -;;;;; yascroll - `(yascroll:thumb-text-area ((t (:background ,zenburn-bg-1)))) - `(yascroll:thumb-fringe ((t (:background ,zenburn-bg-1 :foreground ,zenburn-bg-1)))) - )) - -;;; Theme Variables -(zenburn-with-color-variables - (custom-theme-set-variables - 'zenburn -;;;;; ansi-color - `(ansi-color-names-vector [,zenburn-bg ,zenburn-red ,zenburn-green ,zenburn-yellow - ,zenburn-blue ,zenburn-magenta ,zenburn-cyan ,zenburn-fg]) -;;;;; fill-column-indicator - `(fci-rule-color ,zenburn-bg-05) -;;;;; vc-annotate - `(vc-annotate-color-map - '(( 20. . ,zenburn-red-1) - ( 40. . ,zenburn-red) - ( 60. . ,zenburn-orange) - ( 80. . ,zenburn-yellow-2) - (100. . ,zenburn-yellow-1) - (120. . ,zenburn-yellow) - (140. . ,zenburn-green-1) - (160. . ,zenburn-green) - (180. . ,zenburn-green+1) - (200. . ,zenburn-green+2) - (220. . ,zenburn-green+3) - (240. . ,zenburn-green+4) - (260. . ,zenburn-cyan) - (280. . ,zenburn-blue-2) - (300. . ,zenburn-blue-1) - (320. . ,zenburn-blue) - (340. . ,zenburn-blue+1) - (360. . ,zenburn-magenta))) - `(vc-annotate-very-old-color ,zenburn-magenta) - `(vc-annotate-background ,zenburn-bg-1) - )) - -;;; Rainbow Support - -(declare-function rainbow-mode 'rainbow-mode) -(declare-function rainbow-colorize-by-assoc 'rainbow-mode) - -(defvar barak-add-font-lock-keywords nil - "Whether to add font-lock keywords for zenburn color names. -In buffers visiting library `zenburn-theme.el' the zenburn -specific keywords are always added. In all other Emacs-Lisp -buffers this variable controls whether this should be done. -This requires library `rainbow-mode'.") - -(defvar barak-colors-font-lock-keywords nil) - -;; (defadvice rainbow-turn-on (after zenburn activate) -;; "Maybe also add font-lock keywords for zenburn colors." -;; (when (and (derived-mode-p 'emacs-lisp-mode) -;; (or zenburn-add-font-lock-keywords -;; (equal (file-name-nondirectory (buffer-file-name)) -;; "zenburn-theme.el"))) -;; (unless zenburn-colors-font-lock-keywords -;; (setq zenburn-colors-font-lock-keywords -;; `((,(regexp-opt (mapcar 'car zenburn-colors-alist) 'words) -;; (0 (rainbow-colorize-by-assoc zenburn-colors-alist)))))) -;; (font-lock-add-keywords nil zenburn-colors-font-lock-keywords))) - -;; (defadvice rainbow-turn-off (after zenburn activate) -;; "Also remove font-lock keywords for zenburn colors." -;; (font-lock-remove-keywords nil zenburn-colors-font-lock-keywords)) - -;;; Footer - -;;;###autoload -(and load-file-name - (boundp 'custom-theme-load-path) - (add-to-list 'custom-theme-load-path - (file-name-as-directory - (file-name-directory load-file-name)))) - -;(defun color-theme-barak-extras () -;; Highlight numbers -;(add-hook 'after-change-major-mode-hook - ;(lambda () (font-lock-add-keywords - ;nil - ;'(("\\<\\(\\(0[xX]\\|0[bB]\\)?-?[0-9a-fA-F]+\\.?[0-9]*?[fFlL]?\\)\\>" 1 '((t (:foreground "#E3AC3D"))))))))) - -(provide-theme 'barak) - -;;;###autoload -(add-to-list 'safe-local-eval-forms - '(when (require 'rainbow-mode nil t) (rainbow-mode 1))) - -;; Local Variables: -;; no-byte-compile: t -;; indent-tabs-mode: nil -;; eval: (when (require 'rainbow-mode nil t) (rainbow-mode 1)) -;; End: diff --git a/.emacs.d/themes/barak-theme.el b/.emacs.d/themes/barak-theme.el deleted file mode 100644 index 6c100a9..0000000 --- a/.emacs.d/themes/barak-theme.el +++ /dev/null @@ -1,245 +0,0 @@ -;;; Code: - -(deftheme barak "Barak's Theme") - -;;; Color Palette - -(defvar zenburn-colors-alist - '(("zenburn-fg+1" . "#FFFFEF") - ("zenburn-fg" . "#DCDCCC") - ("zenburn-fg-1" . "#656555") - ("zenburn-bg-2" . "#000000") - ("zenburn-bg-1" . "#2B2B2B") - ("zenburn-bg-05" . "#383838") - ("zenburn-bg" . "#3F3F3F") - ("zenburn-bg+1" . "#4F4F4F") - ("zenburn-bg+2" . "#5F5F5F") - ("zenburn-bg+3" . "#6F6F6F") - ("zenburn-red+1" . "#DCA3A3") - ("zenburn-red" . "#CC9393") - ("zenburn-red-1" . "#BC8383") - ("zenburn-red-2" . "#AC7373") - ("zenburn-red-3" . "#9C6363") - ("zenburn-red-4" . "#8C5353") - ("zenburn-orange" . "#DFAF8F") - ("zenburn-yellow" . "#F0DFAF") - ("zenburn-yellow-1" . "#E0CF9F") - ("zenburn-yellow-2" . "#D0BF8F") - ("zenburn-green-1" . "#5F7F5F") - ("zenburn-green" . "#7F9F7F") - ("zenburn-green+1" . "#8FB28F") - ("zenburn-green+2" . "#9FC59F") - ("zenburn-green+3" . "#AFD8AF") - ("zenburn-green+4" . "#BFEBBF") - ("zenburn-cyan" . "#93E0E3") - ("zenburn-blue+1" . "#94BFF3") - ("zenburn-blue" . "#8CD0D3") - ("zenburn-blue-1" . "#7CB8BB") - ("zenburn-blue-2" . "#6CA0A3") - ("zenburn-blue-3" . "#5C888B") - ("zenburn-blue-4" . "#4C7073") - ("zenburn-blue-5" . "#366060") - ("zenburn-magenta" . "#DC8CC3"))) - -(defvar barak-colors-alist - '(("background" . "#000000") - ("cursor" . "#A7A7A7") - ("fg-default" . "#E0E0E0") - ("mouse" . "sienna1") - ("comment" . "#238E23") - ("constant" . "#E3AC3D") - ("docstring" . "DarkOrange") - ("zenburn-fg+1" . "#FFFFEF") - ("zenburn-fg" . "#DCDCCC") - ("zenburn-fg-1" . "#656555") - ("zenburn-bg-2" . "#000000") - ("zenburn-bg-1" . "#2B2B2B") - ("zenburn-bg-05" . "#383838") - ("zenburn-bg" . "#3F3F3F") - ("zenburn-bg+1" . "#4F4F4F") - ("zenburn-bg+2" . "#5F5F5F") - ("zenburn-bg+3" . "#6F6F6F") - ("zenburn-red+1" . "#DCA3A3") - ("zenburn-red" . "#CC9393") - ("zenburn-red-1" . "#BC8383") - ("zenburn-red-2" . "#AC7373") - ("zenburn-red-3" . "#9C6363") - ("zenburn-red-4" . "#8C5353") - ("zenburn-orange" . "#DFAF8F") - ("zenburn-yellow" . "#F0DFAF") - ("zenburn-yellow-1" . "#E0CF9F") - ("zenburn-yellow-2" . "#D0BF8F") - ("zenburn-green-1" . "#5F7F5F") - ("zenburn-green" . "#7F9F7F") - ("zenburn-green+1" . "#8FB28F") - ("zenburn-green+2" . "#9FC59F") - ("zenburn-green+3" . "#AFD8AF") - ("zenburn-green+4" . "#BFEBBF") - ("zenburn-cyan" . "#93E0E3") - ("zenburn-blue+1" . "#94BFF3") - ("zenburn-blue" . "#8CD0D3") - ("zenburn-blue-1" . "#7CB8BB") - ("zenburn-blue-2" . "#6CA0A3") - ("zenburn-blue-3" . "#5C888B") - ("zenburn-blue-4" . "#4C7073") - ("zenburn-blue-5" . "#366060") - ("zenburn-magenta" . "#DC8CC3")) - "List of Zenburn colors. -Each element has the form (NAME . HEX).") - - -(defmacro barak-with-color-variables (&rest body) - "`let' bind all colors defined in `zenburn-colors-alist' around BODY. -Also bind `class' to ((class color) (min-colors 89))." - (declare (indent 0)) - `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - barak-colors-alist)) - ,@body)) - -(defmacro zenburn-with-color-variables (&rest body) - "`let' bind all colors defined in `zenburn-colors-alist' around BODY. -Also bind `class' to ((class color) (min-colors 89))." - (declare (indent 0)) - `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - zenburn-colors-alist)) - ,@body)) - -;;; Theme Faces -(barak-with-color-variables - (custom-theme-set-faces - 'barak -;;;; Built-in -;;;;; basic coloring - '(button ((t (:underline t)))) - `(link ((t (:foreground ,zenburn-yellow :underline t :weight bold)))) - `(link-visited ((t (:foreground ,zenburn-yellow-2 :underline t :weight normal)))) - `(default ((t (:foreground ,fg-default :background ,background)))) - `(cursor ((t (:foreground ,cursor :background ,zenburn-fg+1)))) - `(blue ((t (:foreground "blue")))) - `(bold ((t (:bold t)))) - `(bold-italic ((t (:bold t)))) - `(border-glyph ((t (nil)))) - `(buffers-tab ((t (:background "#121212" :foreground "#E0E0E0")))) - `(font-lock-builtin-face ((t (:foreground "#E0E0E0")))) - `(font-lock-comment-face ((t (:foreground "#238E23")))) - `(font-lock-constant-face ((t (:foreground "#E3AC3D")))) - `(font-lock-doc-string-face ((t (:foreground "DarkOrange")))) - `(font-lock-function-name-face ((t (:foreground "#C5A6FF")))) - `(font-lock-keyword-face ((t (:bold t :foreground "#4876FF")))) - `(font-lock-preprocessor-face ((t (:foreground "#E9DFEF")))) - `(font-lock-reference-face ((t (:foreground "#E1634F")))) - `(font-lock-regexp-grouping-backslash ((t (:foreground "#E9C062")))) - `(font-lock-regexp-grouping-construct ((t (:foreground "red")))) - `(font-lock-string-face ((t (:foreground "#F05656")))) - `(font-lock-type-face ((t (:foreground "#73E1E6")))) - `(font-lock-variable-name-face ((t (:foreground "#00BFFF")))) - `(font-lock-warning-face ((t (:bold t :foreground "Pink")))) - `(gui-element ((t (:background "#D4D0C8" :foreground "black")))) - `(region ((t (:background "#364458")))) - `(mode-line ((t (:background "grey75" :foreground "black")))) - `(highlight ((t (:background "#222222")))) - `(highline-face ((t (:background "SeaGreen")))) - `(italic ((t (nil)))) - `(left-margin ((t (nil)))) - ;`(text-cursor ((t (:background "yellow" :foreground "black")))) - `(toolbar ((t (nil)))) - `(tabbar-default ((t (:background "black" :foreground "grey75")))) - `(tabbar-selected ((t (:background "grey75" :foreground "black")))) - `(tabbar-highlight ((t (:bold t)))) - `(underline ((nil (:underline nil)))) - )) - -;;; Theme Variables -(zenburn-with-color-variables - (custom-theme-set-variables - 'barak -;;;;; ansi-color - `(ansi-color-names-vector [,zenburn-bg ,zenburn-red ,zenburn-green ,zenburn-yellow - ,zenburn-blue ,zenburn-magenta ,zenburn-cyan ,zenburn-fg]) -;;;;; fill-column-indicator - `(fci-rule-color ,zenburn-bg-05) -;;;;; vc-annotate - `(vc-annotate-color-map - '(( 20. . ,zenburn-red-1) - ( 40. . ,zenburn-red) - ( 60. . ,zenburn-orange) - ( 80. . ,zenburn-yellow-2) - (100. . ,zenburn-yellow-1) - (120. . ,zenburn-yellow) - (140. . ,zenburn-green-1) - (160. . ,zenburn-green) - (180. . ,zenburn-green+1) - (200. . ,zenburn-green+2) - (220. . ,zenburn-green+3) - (240. . ,zenburn-green+4) - (260. . ,zenburn-cyan) - (280. . ,zenburn-blue-2) - (300. . ,zenburn-blue-1) - (320. . ,zenburn-blue) - (340. . ,zenburn-blue+1) - (360. . ,zenburn-magenta))) - `(vc-annotate-very-old-color ,zenburn-magenta) - `(vc-annotate-background ,zenburn-bg-1) - )) - -;;; Rainbow Support - -(declare-function rainbow-mode 'rainbow-mode) -(declare-function rainbow-colorize-by-assoc 'rainbow-mode) - -(defvar barak-add-font-lock-keywords nil - "Whether to add font-lock keywords for zenburn color names. -In buffers visiting library `zenburn-theme.el' the zenburn -specific keywords are always added. In all other Emacs-Lisp -buffers this variable controls whether this should be done. -This requires library `rainbow-mode'.") - -(defvar barak-colors-font-lock-keywords nil) - -;; (defadvice rainbow-turn-on (after zenburn activate) -;; "Maybe also add font-lock keywords for zenburn colors." -;; (when (and (derived-mode-p 'emacs-lisp-mode) -;; (or zenburn-add-font-lock-keywords -;; (equal (file-name-nondirectory (buffer-file-name)) -;; "zenburn-theme.el"))) -;; (unless zenburn-colors-font-lock-keywords -;; (setq zenburn-colors-font-lock-keywords -;; `((,(regexp-opt (mapcar 'car zenburn-colors-alist) 'words) -;; (0 (rainbow-colorize-by-assoc zenburn-colors-alist)))))) -;; (font-lock-add-keywords nil zenburn-colors-font-lock-keywords))) - -;; (defadvice rainbow-turn-off (after zenburn activate) -;; "Also remove font-lock keywords for zenburn colors." -;; (font-lock-remove-keywords nil zenburn-colors-font-lock-keywords)) - -;;; Footer - -;;;###autoload -(and load-file-name - (boundp 'custom-theme-load-path) - (add-to-list 'custom-theme-load-path - (file-name-as-directory - (file-name-directory load-file-name)))) - -(defun color-theme-barak-extras () -; Highlight numbers -(add-hook 'after-change-major-mode-hook - (lambda () (font-lock-add-keywords - nil - '(("\\<\\(\\(0[xX]\\|0[bB]\\)?-?[0-9a-fA-F]+\\.?[0-9]*?[fFlL]?\\)\\>" 1 '((t (:foreground "#E3AC3D"))))))))) - -(provide-theme 'barak) - -;;;###autoload -(add-to-list 'safe-local-eval-forms - '(when (require 'rainbow-mode nil t) (rainbow-mode 1))) - -;; Local Variables: -;; no-byte-compile: t -;; indent-tabs-mode: nil -;; eval: (when (require 'rainbow-mode nil t) (rainbow-mode 1)) -;; End: diff --git a/.vim/bundle/eclim/eclim/autoload/eclim.vim b/.vim/bundle/eclim/eclim/autoload/eclim.vim deleted file mode 100644 index 538ab0e..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim.vim +++ /dev/null @@ -1,339 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Plugin that integrates vim with the eclipse plugin eclim (ECLipse -" IMproved). -" -" This plugin contains shared functions that can be used regardless of the -" current file type being edited. -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ - if !exists("g:EclimShowErrors") - let g:EclimShowErrors = 1 - endif -" }}} - -" Script Variables {{{ - let s:command_ping = '-command ping' - let s:command_settings = '-command settings' - let s:command_settings_update = '-command settings_update -s ""' - let s:command_shutdown = "-command shutdown" - let s:connect= '^connect: .*$' - - " list of commands that may fail using system() call, so using a temp file - " instead. - let s:exec_commands = ['java_complete'] - - let g:eclimd_running = 1 -" }}} - -function! eclim#Execute(command, ...) " {{{ - " Optional args: - " options { - " One of the following to determine the eclimd instance to use, honored in - " the order shown here: - " instance: dictionary representing an eclimd instance. - " project: project name - " workspace: workspace path - " dir: directory path to use as the current dir - " exec: 1 to execute the command using execute instead of system. - " raw: 1 to get the result without evaluating as json - " } - - if exists('g:EclimDisabled') - return - endif - - " eclimd appears to be down, so exit early if in an autocmd - if !g:eclimd_running && expand('') != '' - " check for file created by eclimd to signal that it is running. - if !eclim#EclimAvailable() - return - endif - endif - - let g:eclimd_running = 1 - - let command = '-editor vim ' . a:command - - " encode special characters - " http://www.w3schools.com/TAGS/ref_urlencode.asp - let command = substitute(command, '\*', '%2A', 'g') - let command = substitute(command, '\$', '%24', 'g') - let command = substitute(command, '<', '%3C', 'g') - let command = substitute(command, '>', '%3E', 'g') - - " determine the eclimd instance to use - let options = a:0 ? a:1 : {} - let instance = get(options, 'instance', {}) - if len(instance) == 0 - let workspace = '' - - let project = get(options, 'project', '') - if project != '' - let workspace = eclim#project#util#GetProjectWorkspace(project) - endif - if workspace == '' - let workspace = get(options, 'workspace', '') - endif - - let dir = workspace != '' ? workspace : get(options, 'dir', '') - let chosen = eclim#client#nailgun#ChooseEclimdInstance(dir) - if type(chosen) != g:DICT_TYPE - return - endif - let instance = chosen - endif - - let exec = get(options, 'exec', 0) - let [retcode, result] = eclim#client#nailgun#Execute(instance, command, exec) - let result = substitute(result, '\n$', '', '') - - " not sure this is the best place to handle this, but when using the python - " client, the result has a trailing ctrl-m on windows. also account for - " running under cygwin vim. - if has('win32') || has('win64') || has('win32unix') - let result = substitute(result, "\$", '', '') - endif - - " an echo during startup causes an annoying issue with vim. - "call eclim#util#Echo(' ') - - " check for errors - let error = '' - if result =~ '^[^\n]*Exception:\?[^\n]*\n\s\+\ ' || - \ result =~ '^[^\n]*ResourceException(.\{-})\[[0-9]\+\]:[^\n]*\n\s\+\ ' - if g:EclimLogLevel < 10 - let error = substitute(result, '\(.\{-}\)\n.*', '\1', '') - else - let error = result - endif - elseif retcode - let error = result - endif - - if retcode || error != '' - if g:EclimShowErrors - if error =~ s:connect - " eclimd is not running, disable further eclimd calls - let g:eclimd_running = 0 - - " if we are not in an autocmd or the autocmd is for an acwrite buffer, - " alert the user that eclimd is not running. - if expand('') == '' || &buftype == 'acwrite' - call eclim#util#EchoWarning( - \ "unable to connect to eclimd (port: " . instance.port . ") - " . error) - endif - else - let error = error . "\n" . - \ 'while executing command (port: ' . instance.port . '): ' . command - " if we are not in an autocmd or in a autocmd for an acwrite buffer, - " echo the error, otherwise just log it. - if expand('') == '' || &buftype == 'acwrite' - call eclim#util#EchoError(error) - else - call eclim#util#EchoDebug(error) - endif - endif - endif - return - endif - - let raw = get(options, 'raw', 0) - return result != '' && !raw ? eval(result) : result -endfunction " }}} - -function! eclim#Disable() " {{{ - if !exists('g:EclimDisabled') - let g:EclimDisabled = 1 - endif -endfunction " }}} - -function! eclim#Enable() " {{{ - if exists('g:EclimDisabled') - unlet g:EclimDisabled - endif -endfunction " }}} - -function! eclim#EclimAvailable() " {{{ - let instances = eclim#UserHome() . '/.eclim/.eclimd_instances' - return filereadable(instances) -endfunction " }}} - -function! eclim#PingEclim(echo, ...) " {{{ - " If echo is non 0, then the result is echoed to the user. - " Optional args: - " workspace - - let workspace = a:0 ? a:1 : '' - if a:echo - let result = eclim#Execute(s:command_ping, {'workspace': workspace}) - if type(result) == g:DICT_TYPE - call eclim#util#Echo( - \ 'eclim ' . result.eclim . "\n" . - \ 'eclipse ' . result.eclipse) - endif - else - let savedErr = g:EclimShowErrors - let savedLog = g:EclimLogLevel - let g:EclimShowErrors = 0 - let g:EclimLogLevel = 0 - - let result = eclim#Execute(s:command_ping, {'workspace': workspace}) - - let g:EclimShowErrors = savedErr - let g:EclimLogLevel = savedLog - - return type(result) == g:DICT_TYPE - endif -endfunction " }}} - -function! eclim#ParseSettingErrors(errors) " {{{ - let errors = [] - for error in a:errors - let setting = substitute(error, '^\(.\{-}\): .*', '\1', '') - let message = substitute(error, '^.\{-}: \(.*\)', '\1', '') - let line = search('^\s*' . setting . '\s*=', 'cnw') - call add(errors, { - \ 'bufnr': bufnr('%'), - \ 'lnum': line > 0 ? line : 1, - \ 'text': message, - \ 'type': 'e' - \ }) - endfor - return errors -endfunction " }}} - -function! eclim#SaveSettings(command, project) " {{{ - " don't check modified since undo seems to not set the modified flag - "if &modified - let tempfile = substitute(tempname(), '\', '/', 'g') - - " get all lines, filtering out comments and blank lines - let lines = filter(getline(1, line('$')), 'v:val !~ "^\\s*\\(#\\|$\\)"') - - " convert lines into a settings dict - let index = 0 - let settings = {} - let pattern = '^\s*\([[:alnum:]_.-]\+\)\s*=\s*\(.*\)' - while index < len(lines) - if lines[index] =~ pattern - let name = substitute(lines[index], pattern, '\1', '') - let value = substitute(lines[index], pattern, '\2', '') - while value =~ '\\$' - let index += 1 - let value = substitute(value, '\\$', '', '') - let value .= substitute(lines[index], '^\s*', '', '') - endwhile - let settings[name] = value - endif - let index += 1 - endwhile - call writefile([string(settings)], tempfile) - - if has('win32unix') - let tempfile = eclim#cygwin#WindowsPath(tempfile) - endif - - let command = a:command - let command = substitute(command, '', a:project, '') - let command = substitute(command, '', tempfile, '') - - if exists('b:eclimd_instance') - let result = eclim#Execute(command, {'instance': b:eclimd_instance}) - else - let result = eclim#Execute(command) - endif - - if type(result) == g:LIST_TYPE - call eclim#util#EchoError - \ ("Operation contained errors. See location list for details.") - call eclim#util#SetLocationList(eclim#ParseSettingErrors(result)) - else - call eclim#util#ClearLocationList() - call eclim#util#Echo(result) - endif - - setlocal nomodified - "endif -endfunction " }}} - -function! eclim#Settings(workspace) " {{{ - let instance = eclim#client#nailgun#ChooseEclimdInstance(a:workspace) - if type(instance) != g:DICT_TYPE - return - endif - - let settings = eclim#Execute(s:command_settings, {'instance': instance}) - if type(settings) != g:LIST_TYPE - return - endif - - let content = ['# Global settings for workspace: ' . instance.workspace, ''] - let path = '' - for setting in settings - if setting.path != path - if path != '' - let content += ['# }', ''] - endif - let path = setting.path - call add(content, '# ' . path . ' {') - endif - let description = split(setting.description, '\n') - let content += map(description, "'\t# ' . v:val") - call add(content, "\t" . setting.name . '=' . setting.value) - endfor - if path != '' - call add(content, '# }') - endif - - call eclim#util#TempWindow("Eclim_Global_Settings", content) - setlocal buftype=acwrite - setlocal filetype=jproperties - setlocal noreadonly - setlocal modifiable - setlocal foldmethod=marker - setlocal foldmarker={,} - let b:eclimd_instance = instance - - augroup eclim_settings - autocmd! BufWriteCmd - exec 'autocmd BufWriteCmd ' . - \ 'call eclim#SaveSettings(s:command_settings_update, "")' - augroup END -endfunction " }}} - -function! eclim#ShutdownEclim() " {{{ - call eclim#Execute(s:command_shutdown) -endfunction " }}} - -function! eclim#UserHome() " {{{ - let home = expand('$HOME') - if has('win32unix') - let home = eclim#cygwin#WindowsHome() - elseif has('win32') || has('win64') - let home = expand('$USERPROFILE') - endif - return substitute(home, '\', '/', 'g') -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/client/nailgun.vim b/.vim/bundle/eclim/eclim/autoload/eclim/client/nailgun.vim deleted file mode 100644 index 5bbd66d..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/client/nailgun.vim +++ /dev/null @@ -1,195 +0,0 @@ -" Author: Eric Van Dewoestine -" -" License: {{{ -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ - if !exists("g:EclimNailgunKeepAlive") - " keepAlive flag - can be re-defined in the user ~/.vimrc . - " Read once, on client initialization. Subsequent changes of - " this flag in run-time has no effect. - let g:EclimNailgunKeepAlive = 0 - endif -" }}} - -function! eclim#client#nailgun#ChooseEclimdInstance(...) " {{{ - " Function which prompts the user to pick the target workspace and returns - " their choice or if only one workspace is active simply return it without - " prompting the user. If the optional 'dir' argument is supplied and that dir - " is a subdirectory of one of the workspaces, then that workspace will be - " returned. - " Option args: - " dir - - let instances = eclim#client#nailgun#GetEclimdInstances() - if type(instances) == g:NUMBER_TYPE - call eclim#util#Echo(printf( - \ 'No eclimd instances found running (eclimd created file not found %s)', - \ eclim#UserHome() . '/.eclim/.eclimd_instances')) - return - endif - - if len(instances) == 1 - return instances[keys(instances)[0]] - endif - - if len(instances) > 1 - let path = a:0 && a:1 != '' ? a:1 : expand('%:p') - if path == '' - let path = getcwd() . '/' - endif - let path = substitute(path, '\', '/', 'g') - - " when we are in a temp window, use the initiating filename - if &buftype != '' && exists('b:filename') - let path = b:filename - endif - - " project inside of a workspace dir - for workspace in keys(instances) - if path =~ '^' . workspace - return instances[workspace] - endif - endfor - - " project outside of a workspace dir - let project = eclim#project#util#GetProject(path) - if len(project) > 0 - return get(instances, project.workspace, 0) - endif - - let workspaces = keys(instances) - let response = eclim#util#PromptList( - \ 'Muliple workspaces found, please choose the target workspace', - \ workspaces, g:EclimInfoHighlight) - - " user cancelled, error, etc. - if response < 0 - return - endif - - return instances[workspaces[response]] - endif - - call eclim#util#Echo('No eclimd instances found running.') -endfunction " }}} - -function! eclim#client#nailgun#GetEclimdInstances() " {{{ - let instances = {} - let dotinstances = eclim#UserHome() . '/.eclim/.eclimd_instances' - if filereadable(dotinstances) - let lines = readfile(dotinstances) - for line in lines - if line !~ '^{' - continue - endif - let values = eval(line) - let instances[values.workspace] = values - endfor - return instances - endif -endfunction " }}} - -function! eclim#client#nailgun#Execute(instance, command, ...) " {{{ - let exec = a:0 ? a:1 : 0 - - if !exec - if !exists('g:EclimNailgunClient') - call s:DetermineClient() - endif - - if g:EclimNailgunClient == 'python' && has('python') - return eclim#client#python#nailgun#Execute(a:instance.port, a:command) - endif - endif - - let eclim = eclim#client#nailgun#GetEclimCommand(a:instance.home) - if string(eclim) == '0' - return [1, g:EclimErrorReason] - endif - - let command = a:command - if exec - let command = escape(command, '%#') - endif - - " on windows/cygwin where cmd.exe is used, we need to escape any '^' - " characters in the command args. - if has('win32') || has('win64') || has('win32unix') - let command = substitute(command, '\^', '^^', 'g') - endif - - let eclim .= ' --nailgun-port ' . a:instance.port . ' ' . command - if exec - let eclim = '!' . eclim - endif - - let result = eclim#util#System(eclim, exec, exec) - return [v:shell_error, result] -endfunction " }}} - -function! eclim#client#nailgun#GetEclimCommand(home) " {{{ - " Gets the command to exexute eclim. - let command = a:home . 'bin/eclim' - - if has('win32') || has('win64') || has('win32unix') - let command = command . (has('win95') ? '.bat' : '.cmd') - endif - - if !filereadable(command) - let g:EclimErrorReason = 'Could not locate file: ' . command - return - endif - - if has('win32unix') - " in cygwin, we must use 'cmd /c' to prevent issues with eclim script + - " some arg containing spaces causing a failure to invoke the script. - return 'cmd /c "' . eclim#cygwin#WindowsPath(command) . '"' - endif - return '"' . command . '"' -endfunction " }}} - -function! s:DetermineClient() " {{{ - " at least one ubuntu user had serious performance issues using the python - " client, so we are only going to default to python on windows machines - " where there is an actual potential benefit to using it. - if has('python') && (has('win32') || has('win64')) - let g:EclimNailgunClient = 'python' - else - let g:EclimNailgunClient = 'external' - endif -endfunction " }}} - -function! eclim#client#nailgun#CommandCompleteWorkspaces(argLead, cmdLine, cursorPos) " {{{ - " Custom command completion for available workspaces. - - let cmdLine = strpart(a:cmdLine, 0, a:cursorPos) - let args = eclim#util#ParseCmdLine(cmdLine) - let argLead = cmdLine =~ '\s$' ? '' : args[len(args) - 1] - - let instances = eclim#client#nailgun#GetEclimdInstances() - let workspaces = sort(keys(instances)) - if cmdLine !~ '[^\\]\s$' - call filter(workspaces, 'v:val =~ "^' . argLead . '"') - endif - - return workspaces -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.py b/.vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.py deleted file mode 100644 index 4abaa76..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.py +++ /dev/null @@ -1,214 +0,0 @@ -""" -Copyright (C) 2005 - 2011 Eric Van Dewoestine - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -@author: Anton Sharonov -@author: Eric Van Dewoestine -""" -import socket - -try: - from cStringIO import StringIO -except: - from StringIO import StringIO - -class Nailgun(object): - """ - Client used to communicate with a nailgun server. - """ - - def __init__(self, **kwargs): - self.socket = None - self.port = kwargs.get('port') - self.keepAlive = int(kwargs.get('keepAlive', 0)) - self.reconnectCounter = 0 - - def send(self, cmdline): - """ - Sends a complete command to the nailgun server. Handles connecting to the - server if not currently connected. - @param cmdline command, which is sent to server, for instance - "-command ping". - @return tuple consisting of: - - retcode from server (0 for success, non-0 for failure) - - string response from server - """ - if not self.isConnected(): - # with keepAlive do only first reconnect - if not self.keepAlive or self.reconnectCounter == 0: - (retcode, result) = self.reconnect() - if retcode: - return (retcode, result) - - if not self.isConnected(): # Only for keepAlive - return (-1, "connect: ERROR - socket is not connected (nailgun.py)") - - try: # outer try for pre python 2.5 support. - try: - for arg in self.parseArgs(cmdline): - self.sendChunk("A", arg) - - if self.keepAlive: - self.sendChunk("K") - - self.sendChunk("C", "org.eclim.command.Main") - - (retcode, result) = self.processResponse() - if self.keepAlive and retcode: - # force reconnect on error (may not be necessary) - self.reconnect() - - return (retcode, result) - except socket.error, ex: - args = ex.args - if len(args) > 1: - retcode, msg = args[0], args[1] - elif len(args): - retcode, msg = 1, args[0] - else: - retcode, msg = 1, 'No message' - return (retcode, 'send: %s' % msg) - finally: - if not self.keepAlive: - try: - self.close() - except: - # don't let an error on close mask any previous error. - pass - - def connect(self, port=None): - """ - Establishes the connection to specified port or if not supplied, - uses the default. - """ - port = port or self.port - try: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.connect(('localhost', port)) - except socket.error, ex: - args = ex.args - if len(args) > 1: - retcode, msg = args[0], args[1] - elif len(args): - retcode, msg = 1, args[0] - else: - retcode, msg = 1, 'No message' - return (retcode, 'connect: %s' % msg) - - self.socket = sock - return (0, '') - - def reconnect(self): - if self.socket != None: - self.close() - self.reconnectCounter += 1 - return self.connect() - - def close(self): - self.socket.close() - self.socket = None - - def isConnected(self): - return self.socket != None - - def parseArgs(self, cmdline): - # FIXME: doesn't handle escaping of spaces/quotes yet (may never need to) - args = [] - arg = '' - quote = '' - for char in cmdline: - if char == ' ' and not quote: - if arg: - args.append(arg) - arg = '' - elif char == '"' or char == "'": - if quote and char == quote: - quote = '' - elif not quote: - quote = char - else: - arg += char - else: - arg += char - - if arg: - args.append(arg) - - return args - - def sendChunk(self, chunkType, text=''): - """ - Sends a nailgun 'chunk' to the server. - """ - #print("sendChunk " + chunkType + " " + text) - length = len(text) - str = "%c%c%c%c%c" % ( - (length / (65536*256)) % 256, - (length / 65536) % 256, - (length / 256) % 256, - length % 256, - chunkType) - nbytes = self.socket.sendall(str) - nbytes = self.socket.sendall(text) - - def processResponse(self): - result = StringIO() - exit = 0 - exitFlag = 1 # expecting 1 times exit chunk - while exitFlag > 0: - answer = self.recvBlocked(5) - if len(answer) < 5: - print("error: socket closed unexpectedly\n") - return None - lenPayload = ord(answer[0]) * 65536 * 256 \ - + ord(answer[1]) * 65536 \ - + ord(answer[2]) * 256 \ - + ord(answer[3]) - #print("lenPayload detected : %d" % lenPayload) - chunkType = answer[4] - if chunkType == "1": - # STDOUT - result.write(self.recvToFD(1, answer, lenPayload)) - elif chunkType == "2": - # STDERR - result.write(self.recvToFD(2, answer, lenPayload)) - elif chunkType == "X": - exitFlag = exitFlag - 1 - exit = int(self.recvToFD(2, answer, lenPayload)) - else: - print("error: unknown chunk type = %d\n" % chunkType) - exitFlag = 0 - - return [exit, result.getvalue()] - - def recvBlocked(self, lenPayload): - """ - Receives until all data is read - necessary because usual recv sometimes - returns with number of bytes read less then asked. - """ - received = "" - while (len(received) < lenPayload): - received = received + self.socket.recv(lenPayload - len(received)) - return received - - def recvToFD(self, destFD, buf, lenPayload): - """ - This function just mimics the function with the same name from the C - client. We don't really care which file descriptor the server tells us to - write to - STDOUT and STDERR are the same on VIM side (see eclim.bat, - "2>&1" at the end of command). - """ - received = self.recvBlocked(lenPayload) - return received diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.vim b/.vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.vim deleted file mode 100644 index 81cfa31..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/client/python/nailgun.vim +++ /dev/null @@ -1,115 +0,0 @@ -" Author: Anton Sharonov -" Author: Eric Van Dewoestine -" -" Description: {{{ -" -" License: -" -" Copyright (C) 2005 - 2010 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Script Variables {{{ - let s:python_dir = expand(":h") -" }}} - -" Execute(port, command) {{{ -" Sends to the eclimd server command, supplied as argument string. -" Returns server's respond. -function! eclim#client#python#nailgun#Execute(port, command) - call s:InitClient(a:port) - let result_viml = "" - let retcode = 0 - - let begin = localtime() - try -python << PYTHONEOF -command = vim.eval('a:command') -(retcode, result) = client.send(command) -vim.command('let retcode = %i' % retcode) -vim.command("let result = '%s'" % result.replace("'", "''")) -PYTHONEOF - finally - call eclim#util#EchoTrace( - \ 'nailgun.py (port: ' . a:port . '): ' . a:command, localtime() - begin) - endtry - - return [retcode, result] -endfunction " }}} - -" Reconnect(port) {{{ -" Does unconditional reconnect of the python_if -" (useful to manual recover from errors in the python_if) -function! eclim#client#python#nailgun#Reconnect(port) - call s:InitClient(a:port) -python << PYTHONEOF -client.reconnect() -PYTHONEOF -endfunction " }}} - -" SetKeepAlive(port, value) {{{ -" Updates the in runtime value of the keepAlive flag. -function! eclim#client#python#nailgun#SetKeepAlive(port, value) - call s:InitClient(a:port) -python << PYTHONEOF -client.keepAlive = int(vim.eval('a:value')) -PYTHONEOF -endfunction " }}} - -" GetKeepAlive(port) {{{ -" Retrieves the value of the keepAlive flag. -function! eclim#client#python#nailgun#GetKeepAlive(port) - call s:InitClient(a:port) - let result = 0 -python << PYTHONEOF -vim.command("let result = %s" % client.keepAlive) -PYTHONEOF - return result -endfunction " }}} - -" GetReconnectCounter(port) {{{ -" Retrieves the value of the reconnect counter. -function! eclim#client#python#nailgun#GetReconnectCounter(port) - call s:InitClient(a:port) - let result = 0 -python << PYTHONEOF -vim.command("let result = %d" % client.reconnectCounter) -PYTHONEOF - return result -endfunction " }}} - -" s:InitClient(port) {{{ -" Initializes the python interface to the nailgun server. -function! s:InitClient(port) -python << PYTHONEOF -if not vars().has_key('clients'): - import sys, vim - sys.path.append(vim.eval('s:python_dir')) - import nailgun - - clients = {} - -port = int(vim.eval('a:port')) -if not clients.has_key(port): - clients[port] = nailgun.Nailgun( - port=port, - keepAlive=vim.eval('g:EclimNailgunKeepAlive'), - ) -client = clients[port] -PYTHONEOF -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/buffers.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/buffers.vim deleted file mode 100644 index 2bb8f8e..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/buffers.vim +++ /dev/null @@ -1,401 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ -if !exists('g:EclimBuffersSort') - let g:EclimBuffersSort = 'file' -endif -if !exists('g:EclimBuffersSortDirection') - let g:EclimBuffersSortDirection = 'asc' -endif -if !exists('g:EclimBuffersDefaultAction') - let g:EclimBuffersDefaultAction = g:EclimDefaultFileOpenAction -endif -if !exists('g:EclimOnlyExclude') - let g:EclimOnlyExclude = '^NONE$' -endif -if !exists('g:EclimOnlyExcludeFixed') - let g:EclimOnlyExcludeFixed = 1 -endif -" }}} - -" ScriptVariables {{{ - let s:eclim_tab_id = 0 -" }}} - -function! eclim#common#buffers#Buffers(bang) " {{{ - " Like, :buffers, but opens a temporary buffer. - - let options = {'maxfilelength': 0} - let buffers = eclim#common#buffers#GetBuffers(options) - - if g:EclimBuffersSort != '' - call sort(buffers, 'eclim#common#buffers#BufferCompare') - endif - - let lines = [] - let buflist = [] - let filelength = options['maxfilelength'] - let tabid = exists('*gettabvar') ? s:GetTabId() : 0 - let tabbuffers = tabpagebuflist() - for buffer in buffers - let eclim_tab_id = getbufvar(buffer.bufnr, 'eclim_tab_id') - if a:bang != '' || eclim_tab_id == '' || eclim_tab_id == tabid - " for buffers w/ out a tab id, don't show them in the list if they - " are active, but aren't open on the current tab. - if a:bang == '' && buffer.status =~ 'a' && index(tabbuffers, buffer.bufnr) == -1 - continue - endif - - call add(lines, s:BufferEntryToLine(buffer, filelength)) - call add(buflist, buffer) - endif - endfor - - call eclim#util#TempWindow('[buffers]', lines) - - setlocal modifiable noreadonly - call append(line('$'), ['', '" use ? to view help']) - setlocal nomodifiable readonly - - let b:eclim_buffers = buflist - - " syntax - set ft=eclim_buffers - hi link BufferActive Special - hi link BufferHidden Comment - syntax match BufferActive /+\?active\s\+\(\[RO\]\)\?/ - syntax match BufferHidden /+\?hidden\s\+\(\[RO\]\)\?/ - syntax match Comment /^".*/ - - " mappings - nnoremap :call BufferOpen(g:EclimBuffersDefaultAction) - nnoremap E :call BufferOpen('edit') - nnoremap S :call BufferOpen('split') - nnoremap V :call BufferOpen('vsplit') - nnoremap T :call BufferOpen('tablast \| tabnew') - nnoremap D :call BufferDelete() - nnoremap R :Buffers - - " assign to buffer var to get around weird vim issue passing list containing - " a string w/ a '<' in it on execution of mapping. - let b:buffers_help = [ - \ ' - open buffer with default action', - \ 'E - open with :edit', - \ 'S - open in a new split window', - \ 'V - open in a new vertically split window', - \ 'T - open in a new tab', - \ 'D - delete the buffer', - \ 'R - refresh the buffer list', - \ ] - nnoremap ? - \ :call eclim#help#BufferHelp(b:buffers_help, 'vertical', 40) - - "augroup eclim_buffers - " autocmd! - " autocmd BufAdd,BufWinEnter,BufDelete,BufWinLeave * - " \ call eclim#common#buffers#BuffersUpdate() - " autocmd BufUnload autocmd! eclim_buffers - "augroup END -endfunction " }}} - -function! eclim#common#buffers#BuffersToggle(bang) " {{{ - let name = eclim#util#EscapeBufferName('[buffers]') - if bufwinnr(name) == -1 - call eclim#common#buffers#Buffers(a:bang) - else - exec "bdelete " . bufnr(name) - endif -endfunction " }}} - -function! eclim#common#buffers#BufferCompare(buffer1, buffer2) " {{{ - exec 'let attr1 = a:buffer1.' . g:EclimBuffersSort - exec 'let attr2 = a:buffer2.' . g:EclimBuffersSort - let compare = attr1 == attr2 ? 0 : attr1 > attr2 ? 1 : -1 - if g:EclimBuffersSortDirection == 'desc' - let compare = 0 - compare - endif - return compare -endfunction " }}} - -function! eclim#common#buffers#Only() " {{{ - let curwin = winnr() - let winnum = 1 - while winnum <= winnr('$') - let fixed = g:EclimOnlyExcludeFixed && ( - \ getwinvar(winnum, '&winfixheight') == 1 || - \ getwinvar(winnum, '&winfixwidth') == 1) - let excluded = bufname(winbufnr(winnum)) =~ g:EclimOnlyExclude - if winnum != curwin && !fixed && !excluded - if winnum < curwin - let curwin -= 1 - endif - exec winnum . 'winc w' - close - exec curwin . 'winc w' - continue - endif - let winnum += 1 - endwhile -endfunction " }}} - -function! eclim#common#buffers#GetBuffers(...) " {{{ - let options = a:0 ? a:1 : {} - - redir => list - silent buffers - redir END - - let buffers = [] - let maxfilelength = 0 - for entry in split(list, '\n') - let buffer = {} - let buffer.status = substitute(entry, '\s*[0-9]\+\s\+\(.\{-}\)\s\+".*', '\1', '') - let buffer.path = substitute(entry, '.\{-}"\(.\{-}\)".*', '\1', '') - let buffer.path = fnamemodify(buffer.path, ':p') - let buffer.file = fnamemodify(buffer.path, ':p:t') - let buffer.dir = fnamemodify(buffer.path, ':p:h') - let buffer.bufnr = str2nr(substitute(entry, '\s*\([0-9]\+\).*', '\1', '')) - let buffer.lnum = str2nr(substitute(entry, '.*"\s\+\w\+\s\+\(\d\+\)', '\1', '')) - call add(buffers, buffer) - - if len(buffer.file) > maxfilelength - let maxfilelength = len(buffer.file) - endif - endfor - - if has_key(options, 'maxfilelength') - let options['maxfilelength'] = maxfilelength - endif - - return buffers -endfunction " }}} - -function! eclim#common#buffers#TabInit() " {{{ - let tabnr = 1 - while tabnr <= tabpagenr('$') - let tab_id = gettabvar(tabnr, 'eclim_tab_id') - if tab_id == '' - let s:eclim_tab_id += 1 - call settabvar(tabnr, 'eclim_tab_id', s:eclim_tab_id) - for bufnr in tabpagebuflist(tabnr) - let btab_id = getbufvar(bufnr, 'eclim_tab_id') - if btab_id == '' - call setbufvar(bufnr, 'eclim_tab_id', s:eclim_tab_id) - endif - endfor - endif - let tabnr += 1 - endwhile -endfunction " }}} - -function! eclim#common#buffers#TabEnter() " {{{ - if !s:GetTabId() - call s:SetTabId() - endif - - if exists('s:tab_count') && s:tab_count > tabpagenr('$') - " delete any buffers associated with the closed tab - let buffers = eclim#common#buffers#GetBuffers() - for buffer in buffers - let eclim_tab_id = getbufvar(buffer.bufnr, 'eclim_tab_id') - " don't delete active buffers, just in case the tab has the wrong - " eclim_tab_id - if eclim_tab_id == s:tab_prev && buffer.status !~ 'a' - try - exec 'bdelete ' . buffer.bufnr - catch /E89/ - " ignore since it happens when using bd! on the last buffer for - " another tab. - endtry - endif - endfor - endif -endfunction " }}} - -function! eclim#common#buffers#TabLeave() " {{{ - let s:tab_prev = s:GetTabId() - let s:tab_count = tabpagenr('$') -endfunction " }}} - -function! eclim#common#buffers#TabLastOpenIn() " {{{ - if !buflisted('%') - silent! unlet b:eclim_tab_id - endif - - if !s:GetTabId() - call s:SetTabId() - endif - - let tabnr = 1 - let other_tab = 0 - let bufnr = bufnr('%') - while tabnr <= tabpagenr('$') - if tabnr != tabpagenr() && - \ eclim#util#ListContains(tabpagebuflist(tabnr), bufnr) - let other_tab = tabnr - break - endif - let tabnr += 1 - endwhile - - if !exists('b:eclim_tab_id') || !other_tab - let b:eclim_tab_id = s:GetTabId() - endif -endfunction " }}} - -function! eclim#common#buffers#OpenNextHiddenTabBuffer(current) " {{{ - let allbuffers = eclim#common#buffers#GetBuffers() - - " build list of buffers open in other tabs to exclude - let tabbuffers = [] - let lasttab = tabpagenr('$') - let index = 1 - while index <= lasttab - if index != tabpagenr() - for bnum in tabpagebuflist(index) - call add(tabbuffers, bnum) - endfor - endif - let index += 1 - endwhile - - " build list of buffers not open in any window, and last seen on the - " current tab. - let hiddenbuffers = [] - for buffer in allbuffers - let bnum = buffer.bufnr - if bnum != a:current && index(tabbuffers, bnum) == -1 && bufwinnr(bnum) == -1 - let eclim_tab_id = getbufvar(bnum, 'eclim_tab_id') - if eclim_tab_id != '' && eclim_tab_id != t:eclim_tab_id - continue - endif - - if bnum < a:current - call insert(hiddenbuffers, bnum) - else - call add(hiddenbuffers, bnum) - endif - endif - endfor - - " we found a hidden buffer, so open it - if len(hiddenbuffers) > 0 - exec 'buffer ' . hiddenbuffers[0] - doautocmd BufEnter - doautocmd BufWinEnter - doautocmd BufReadPost - return hiddenbuffers[0] - endif - return 0 -endfunction " }}} - -function! s:BufferDelete() " {{{ - let line = line('.') - if line > len(b:eclim_buffers) - return - endif - - let index = line - 1 - setlocal modifiable - setlocal noreadonly - exec line . ',' . line . 'delete _' - setlocal nomodifiable - setlocal readonly - let buffer = b:eclim_buffers[index] - call remove(b:eclim_buffers, index) - - let winnr = bufwinnr(buffer.bufnr) - if winnr != -1 - " if active in a window, go to the window to delete the buffer since that - " keeps eclim's prevention of closing the last non-utility window working - " properly. - let curwin = winnr() - exec winnr . 'winc w' - bdelete - exec curwin . 'winc w' - else - exec 'bd ' . buffer.bufnr - endif -endfunction " }}} - -function! s:BufferEntryToLine(buffer, filelength) " {{{ - let line = '' - let line .= a:buffer.status =~ '+' ? '+' : ' ' - let line .= a:buffer.status =~ 'a' ? 'active' : 'hidden' - let line .= a:buffer.status =~ '[-=]' ? ' [RO] ' : ' ' - let line .= a:buffer.file - - let pad = a:filelength - len(a:buffer.file) + 2 - while pad > 0 - let line .= ' ' - let pad -= 1 - endwhile - - let line .= a:buffer.dir - return line -endfunction " }}} - -function! s:BufferOpen(cmd) " {{{ - let line = line('.') - if line > len(b:eclim_buffers) - return - endif - - let file = bufname(b:eclim_buffers[line - 1].bufnr) - let winnr = b:winnr - close - - " prevent opening the buffer in a split of a vertical tool window (project - " tree, taglist, etc.) - if exists('g:VerticalToolBuffers') && has_key(g:VerticalToolBuffers, winbufnr(winnr)) - let winnr = 1 - while has_key(g:VerticalToolBuffers, winbufnr(winnr)) - let winnr += 1 - if winnr > winnr('$') - let winnr -= 1 - break - endif - endwhile - endif - - exec winnr . 'winc w' - call eclim#util#GoToBufferWindowOrOpen(file, a:cmd) -endfunction " }}} - -function! s:GetTabId(...) " {{{ - let tabnr = a:0 ? a:1 : tabpagenr() - " using gettabvar over t:eclim_tab_id because while autocmds are executing, - " the tabpagenr() may return the correct tab number, but accessing - " t:eclim_tab_id may return the value from the previously focused tab. - return gettabvar(tabnr, 'eclim_tab_id') -endfunction " }}} - -function! s:SetTabId(...) " {{{ - let tabnr = a:0 ? a:1 : tabpagenr() - let s:eclim_tab_id += 1 - " using settabvar for reason explained in s:GetTabId() - call settabvar(tabnr, 'eclim_tab_id', s:eclim_tab_id) -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/history.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/history.vim deleted file mode 100644 index 8567c20..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/history.vim +++ /dev/null @@ -1,332 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ - if !exists('g:EclimHistoryDiffOrientation') - let g:EclimHistoryDiffOrientation = 'vertical' - endif -" }}} - -" Script Variables {{{ -let s:command_add = '-command history_add -p "" -f ""' -let s:command_list = '-command history_list -p "" -f ""' -let s:command_revision = - \ '-command history_revision -p "" -f "" -r ' -let s:command_clear = '-command history_clear -p "" -f ""' -" }}} - -" AddHistory() {{{ -" Adds the current state of the file to the eclipse local history (should be -" invoked prior to saving to disk). -function! eclim#common#history#AddHistory() - if !filereadable(expand('%')) || !eclim#project#util#IsCurrentFileInProject(0) - return - endif - - let project = eclim#project#util#GetCurrentProjectName() - let file = eclim#project#util#GetProjectRelativeFilePath() - let command = s:command_add - let command = substitute(command, '', project, '') - let command = substitute(command, '', file, '') - call eclim#Execute(command) -endfunction " }}} - -" History() {{{ -" Opens a temporary buffer with a list of local history revisions. -function! eclim#common#history#History() - if !eclim#project#util#IsCurrentFileInProject() - return - endif - - let project = eclim#project#util#GetCurrentProjectName() - let file = eclim#project#util#GetProjectRelativeFilePath() - let command = s:command_list - let command = substitute(command, '', project, '') - let command = substitute(command, '', file, '') - let history = eclim#Execute(command) - if type(history) != g:LIST_TYPE - return - endif - - let lines = [file] - let revisions = [0] - let indent = eclim#util#GetIndent(1) - for rev in history - call add(lines, indent . rev.datetime . ' (' . rev.delta . ')') - call add(revisions, rev.timestamp) - endfor - call add(lines, '') - call eclim#util#TempWindow('[History]', lines) - - setlocal modifiable noreadonly - if !g:EclimProjectKeepLocalHistory - call append(line('$'), - \ '" Note: local history is current disabled: ' . - \ 'g:EclimProjectKeepLocalHistory = ' . g:EclimProjectKeepLocalHistory) - endif - call append(line('$'), '" use ? to view help') - setlocal nomodifiable readonly - syntax match Comment /^".*/ - - let b:history_revisions = revisions - call s:Syntax() - - command! -count=1 HistoryDiffNext call s:DiffNextPrev(1, ) - command! -count=1 HistoryDiffPrev call s:DiffNextPrev(-1, ) - augroup eclim_history_window - autocmd! BufWinLeave - autocmd BufWinLeave - \ delcommand HistoryDiffNext | - \ delcommand HistoryDiffPrev - augroup END - noremap :call View() - noremap d :call Diff() - noremap r :call Revert() - noremap c :call Clear(1) - - " assign to buffer var to get around weird vim issue passing list containing - " a string w/ a '<' in it on execution of mapping. - let b:history_help = [ - \ ' - view the entry', - \ 'd - diff the file with the version under the cursor', - \ 'r - revert the file to the version under the cursor', - \ 'c - clear the history', - \ ':HistoryDiffNext - diff the file with the next version in the history', - \ ':HistoryDiffPrev - diff the file with the previous version in the history', - \ ] - nnoremap ? - \ :call eclim#help#BufferHelp(b:history_help, 'vertical', 50) -endfunction " }}} - -" HistoryClear(bang) {{{ -" Clear the history for the current file. -function! eclim#common#history#HistoryClear(bang) - if !eclim#project#util#IsCurrentFileInProject() - return - endif - - call s:Clear(a:bang == '', expand('%:p')) -endfunction " }}} - -" s:View([cmd]) {{{ -" View the contents of the revision under the cursor. -function s:View(...) - if line('.') == 1 || line('.') > len(b:history_revisions) - return - endif - - let current = b:filename - let entry = line('.') - 1 - let revision = b:history_revisions[entry] - if eclim#util#GoToBufferWindow(current) - let filetype = &ft - let project = eclim#project#util#GetCurrentProjectName() - let file = eclim#project#util#GetProjectRelativeFilePath() - let command = s:command_revision - let command = substitute(command, '', project, '') - let command = substitute(command, '', file, '') - let command = substitute(command, '', revision, '') - let result = eclim#Execute(command) - if result == "0" - return - endif - - let cmd = len(a:000) > 0 ? a:000[0] : 'split' - call eclim#util#GoToBufferWindowOrOpen(current . '_' . revision, cmd) - - setlocal modifiable - setlocal noreadonly - - let temp = tempname() - call writefile(split(result, '\n'), temp) - try - silent 1,$delete _ - silent read ++edit `=temp` - silent 1,1delete _ - finally - call delete(temp) - endtry - - exec 'setlocal filetype=' . filetype - setlocal nomodified - setlocal readonly - setlocal nomodifiable - setlocal noswapfile - setlocal nobuflisted - setlocal buftype=nofile - setlocal bufhidden=delete - doautocmd BufReadPost - - call s:HighlightEntry(entry) - - return 1 - else - call eclim#util#EchoWarning('Target file is no longer open.') - endif -endfunction " }}} - -" s:Diff() {{{ -" Diff the contents of the revision under the cursor against the current -" contents. -function s:Diff() - let hist_buf = bufnr('%') - let winend = winnr('$') - let winnum = 1 - while winnum <= winend - let bufnr = winbufnr(winnum) - if getbufvar(bufnr, 'history_diff') != '' - exec bufnr . 'bd' - continue - endif - let winnum += 1 - endwhile - call eclim#util#GoToBufferWindow(hist_buf) - - let current = b:filename - let orien = g:EclimHistoryDiffOrientation == 'horizontal' ? '' : 'vertical' - if s:View(orien . ' below split') - let b:history_diff = 1 - diffthis - augroup history_diff - autocmd! BufWinLeave - call eclim#util#GoToBufferWindowRegister(current) - autocmd BufWinLeave diffoff - augroup END - - call eclim#util#GoToBufferWindow(current) - diffthis - endif -endfunction " }}} - -" s:DiffNextPrev(dir, count) {{{ -function s:DiffNextPrev(dir, count) - let winnr = winnr() - if eclim#util#GoToBufferWindow('[History]') - let num = v:count > 0 ? v:count : a:count - let cur = exists('b:history_current_entry') ? b:history_current_entry : 0 - let index = cur + (a:dir * num) - if index < 0 || index > len(b:history_revisions) - call eclim#util#EchoError('Operation exceeds history stack range.') - exec winnr . 'winc w' - return - endif - call cursor(index + 1, 0) - call s:Diff() - endif -endfunction " }}} - -" s:Revert() {{{ -" Revert the file to the revision under the cursor. -function s:Revert() - if line('.') == 1 || line('.') > len(b:history_revisions) - return - endif - - let current = b:filename - let revision = b:history_revisions[line('.') - 1] - if eclim#util#GoToBufferWindow(current) - let project = eclim#project#util#GetCurrentProjectName() - let file = eclim#project#util#GetProjectRelativeFilePath() - let command = s:command_revision - let command = substitute(command, '', project, '') - let command = substitute(command, '', file, '') - let command = substitute(command, '', revision, '') - let result = eclim#Execute(command) - if result == "0" - return - endif - - let ff = &ff - let temp = tempname() - call writefile(split(result, '\n'), temp) - try - silent 1,$delete _ - silent read ++edit `=temp` - silent 1,1delete _ - finally - call delete(temp) - endtry - - if ff != &ff - call eclim#util#EchoWarning( - \ "Warning: the file format is being reverted from '" . ff . "' to '" . - \ &ff . "'. Using vim's undo will not restore the previous format so " . - \ "if you choose to undo the reverting of this file, you will need to " . - \ "manually set the file format back to " . ff . " (set ff=" . ff . ").") - endif - endif -endfunction " }}} - -" s:Clear(prompt, [filename]) {{{ -" Clear the history. -function s:Clear(prompt, ...) - let response = 1 - if a:prompt - let response = eclim#util#PromptConfirm( - \ 'Clear local history?', g:EclimInfoHighlight) - endif - - if response == 1 - let filename = len(a:000) > 0 ? a:000[0] : b:filename - let current = eclim#project#util#GetProjectRelativeFilePath(filename) - let project = eclim#project#util#GetCurrentProjectName() - let command = s:command_clear - let command = substitute(command, '', project, '') - let command = substitute(command, '', current, '') - let result = eclim#Execute(command) - if result == "0" - return - endif - - if filename != expand('%:p') - quit - endif - call eclim#util#Echo(result) - endif -endfunction " }}} - -" s:Syntax() {{{ -function! s:Syntax() - set ft=eclim_history - hi link HistoryFile Identifier - hi link HistoryCurrentEntry Constant - syntax match HistoryFile /.*\%1l.*/ - syntax match Comment /^".*/ -endfunction " }}} - -" s:HighlightEntry(index) {{{ -function s:HighlightEntry(index) - let winnr = winnr() - if eclim#util#GoToBufferWindow('[History]') - let b:history_current_entry = a:index - try - " forces reset of syntax - call s:Syntax() - exec 'syntax match HistoryCurrentEntry /.*\%' . (a:index + 1) . 'l.*/' - finally - exec winnr . 'winc w' - endtry - endif -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/largefile.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/largefile.vim deleted file mode 100644 index cd3cfc6..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/largefile.vim +++ /dev/null @@ -1,58 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Initially based on vimscript 1506 -" -" License: -" -" Copyright (C) 2005 - 2012 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Script Settings {{{ -let s:file_size = g:EclimLargeFileSize * 1024 * 1024 -let s:events = ['BufRead', 'CursorHold', 'FileType'] -" }}} - -function! eclim#common#largefile#InitSettings() " {{{ - let file = expand("") - let size = getfsize(file) - if size >= s:file_size || size == -2 - if !exists('b:save_events') - let b:save_events = &eventignore - call s:ApplySettings() - setlocal noswapfile nowrap bufhidden=unload - autocmd eclim_largefile BufEnter,BufWinEnter call ApplySettings() - autocmd eclim_largefile BufLeave,BufWinLeave call RevertSettings() - endif - endif -endfunction " }}} - -function! s:ApplySettings() " {{{ - let &eventignore=join(s:events, ',') - if !exists('b:largefile_notified') - let b:largefile_notified = 1 - call eclim#util#Echo('Note: Large file settings applied.') - endif -endfunction " }}} - -function! s:RevertSettings() " {{{ - if exists('b:save_events') - let &eventignore=b:save_events - endif -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/license.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/license.vim deleted file mode 100644 index 4fa954d..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/license.vim +++ /dev/null @@ -1,87 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" -" License: -" -" Copyright (C) 2005 - 2012 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Script Variables {{{ - let s:year = exists('*strftime') ? strftime('%Y') : '2009' -" }}} - -" GetLicense() {{{ -" Retrieves the file containing the license text. -function! eclim#common#license#GetLicense() - let file = eclim#project#util#GetProjectSetting('org.eclim.project.copyright') - if type(file) == g:NUMBER_TYPE - return - elseif file == '' - call eclim#util#EchoWarning( - \ "Project setting 'org.eclim.project.copyright' has not been supplied.") - return - endif - - let file = eclim#project#util#GetCurrentProjectRoot() . '/' . file - if !filereadable(file) - return - endif - return file -endfunction " }}} - -" License(pre, post, mid) {{{ -" Retrieves the license configured license and applies the specified prefix -" and postfix as the lines before and after the license and uses 'mid' as the -" prefix for every line. -" Returns the license as a list of strings. -function! eclim#common#license#License(pre, post, mid) - let file = eclim#common#license#GetLicense() - if type(file) == g:NUMBER_TYPE && file == 0 - return '' - endif - - let contents = readfile(file) - if a:mid != '' - call map(contents, 'a:mid . v:val') - endif - - if a:pre != '' - call insert(contents, a:pre) - endif - - if a:post != '' - call add(contents, a:post) - endif - - call map(contents, "substitute(v:val, '${year}', s:year, 'g')") - - let author = eclim#project#util#GetProjectSetting('org.eclim.user.name') - if type(author) == g:STRING_TYPE && author != '' - call map(contents, "substitute(v:val, '${author}', author, 'g')") - endif - - let email = eclim#project#util#GetProjectSetting('org.eclim.user.email') - if type(email) == g:STRING_TYPE && email != '' - call map(contents, "substitute(v:val, '${email}', email, 'g')") - endif - call map(contents, "substitute(v:val, '\\s\\+$', '', '')") - - return contents -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/locate.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/locate.vim deleted file mode 100644 index 2ecd8df..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/locate.vim +++ /dev/null @@ -1,655 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Implements the :LocateFile functionality. -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ -if !exists('g:EclimLocateFileDefaultAction') - let g:EclimLocateFileDefaultAction = g:EclimDefaultFileOpenAction -endif - -if !exists('g:EclimLocateFileScope') - let g:EclimLocateFileScope = 'project' -endif - -if !exists('g:EclimLocateFileNonProjectScope') - let g:EclimLocateFileNonProjectScope = 'workspace' -endif - -if !exists('g:EclimLocateFileFuzzy') - let g:EclimLocateFileFuzzy = 1 -endif - -if !exists('g:EclimLocateFileCaseInsensitive') - " one of: 'lower', 'never', 'always' - let g:EclimLocateFileCaseInsensitive = 'lower' -endif - -if !exists('g:EclimLocateUserScopes') - let g:EclimLocateUserScopes = [] -endif - -let g:eclim_locate_default_updatetime = &updatetime - -" disable autocomplpop in the locate prompt -if exists('g:acp_behavior') - let g:acp_behavior['locate_prompt'] = [] -endif - -" }}} - -" Script Variables {{{ -let s:command_locate = '-command locate_file -s ""' -let s:scopes = [ - \ 'project', - \ 'workspace', - \ 'buffers', - \ 'quickfix', - \ ] - -let s:help = [ - \ ' - close the locate prompt + results', - \ ', - select the next file', - \ ', - select the previous file', - \ ' - open selected file w/ default action', - \ ' - open with :edit', - \ ' - open in a split window', - \ ' - open in a new tab', - \ ' - choose search scope', - \ ' - toggle help buffer', - \ ] -" }}} - -" LocateFile(action, file, [scope]) {{{ -" Locates a file using the specified action for opening the file when found. -" action - '' (use user default), 'split', 'edit', etc. -" file - 'somefile.txt', -" '', (kick off completion mode), -" '' (locate the file under the cursor) -" scope - optional scope to search in (project, workspace, buffers, etc.) -function! eclim#common#locate#LocateFile(action, file, ...) - let project = eclim#project#util#GetCurrentProjectName() - let scope = a:0 > 0 ? a:1 : g:EclimLocateFileScope - - if !eclim#util#ListContains(s:scopes, scope) && - \ !eclim#util#ListContains(g:EclimLocateUserScopes, scope) - call eclim#util#EchoWarning('Unrecognized scope: ' . scope) - return - endif - - if scope == 'project' && (project == '' || !eclim#EclimAvailable()) - let scope = g:EclimLocateFileNonProjectScope - endif - - let workspace = '' - if scope == 'project' || scope == 'workspace' - let instance = eclim#client#nailgun#ChooseEclimdInstance() - if type(instance) != g:DICT_TYPE - return - endif - - let workspace = instance.workspace - if !eclim#PingEclim(0, workspace) - call eclim#util#EchoError('Unable to connect to eclimd.') - return - endif - endif - - let results = [] - let action = a:action - if action == '' - let action = g:EclimLocateFileDefaultAction - endif - - let file = a:file - if file == '' - call s:LocateFileCompletionInit(action, scope, project, workspace) - return - elseif file == '' - let file = eclim#util#GrabUri() - - " if grabbing a relative url, remove any anchor info or query parameters - let file = substitute(file, '[#?].*', '', '') - endif - - let name = fnamemodify(file, ':t') - if name == '' - call eclim#util#Echo('Please supply more than just a directory name.') - return - endif - - let pattern = file - let pattern = s:LocateFileConvertPattern(pattern, 0) - let pattern = '[^/]*' . pattern - try - let b:workspace = workspace - let b:project = project - let results = s:LocateFileFunction(scope)(pattern) - finally - unlet! b:workspce - unlet! b:project - endtry - - call map(results, "v:val.path") - - let result = '' - " One result. - if len(results) == 1 - let result = results[0] - - " More than one result. - elseif len(results) > 1 - let message = "Multiple results, choose the file to open" - let response = eclim#util#PromptList(message, results, g:EclimInfoHighlight) - if response == -1 - return - endif - - let result = results[response] - - " No results - else - call eclim#util#Echo('Unable to locate file pattern "' . file . '".') - return - endif - - if has('win32unix') - let result = eclim#cygwin#CygwinPath(result) - endif - - call eclim#util#GoToBufferWindowOrOpen(eclim#util#Simplify(result), action) - call eclim#util#Echo(' ') -endfunction " }}} - -function! eclim#common#locate#LocateFileCompletion() " {{{ - let line = getline('.') - if line !~ '^> ' - call setline(1, substitute(line, '^>\?\s*', '> \1', '')) - call cursor(1, 3) - let line = getline('.') - endif - - let completions = [] - let display = [] - let name = substitute(line, '^>\s*', '', '') - if name !~ '^\s*$' - let pattern = name - let pattern = s:LocateFileConvertPattern(pattern, g:EclimLocateFileFuzzy) - - let results = s:LocateFileFunction(b:scope)(pattern) - if !empty(results) - for result in results - let rel = eclim#util#Simplify(get(result, 'projectPath', result.path)) - let dict = {'word': result.name, 'menu': rel, 'info': result.path} - call add(completions, dict) - call add(display, result.name . ' ' . rel) - endfor - endif - endif - let b:completions = completions - let winnr = winnr() - noautocmd exec bufwinnr(b:results_bufnum) . 'winc w' - setlocal modifiable - 1,$delete _ - call append(1, display) - 1,1delete _ - setlocal nomodifiable - exec winnr . 'winc w' - - " part of bad hack for gvim on windows - let b:start_selection = 1 - - call s:LocateFileSelection(1) -endfunction " }}} - -function! eclim#common#locate#LocateFileClose() " {{{ - if bufname(bufnr('%')) !~ '^\[Locate.*\]$' - let bufnr = bufnr('\[Locate in *\]') - let winnr = bufwinnr(bufnr) - if winnr != -1 - let curbuf = bufnr('%') - exec winnr . 'winc w' - try - exec 'bw ' . b:results_bufnum - bw - autocmd! locate_file_init - stopinsert - finally - exec bufwinnr(curbuf) . 'winc w' - endtry - endif - endif -endfunction " }}} - -function! s:LocateFileCompletionInit(action, scope, project, workspace) " {{{ - let file = expand('%') - let bufnum = bufnr('%') - let winrestcmd = winrestcmd() - - topleft 12split [Locate\ Results] - set filetype=locate_results - setlocal nonumber nowrap - setlocal noswapfile nobuflisted - setlocal buftype=nofile bufhidden=delete - - let results_bufnum = bufnr('%') - - let locate_in = (a:scope == 'project' ? a:project : a:scope) - exec 'topleft 1split ' . escape('[Locate in ' . locate_in . ']', ' -') - setlocal modifiable - call setline(1, '> ') - call cursor(1, col('$')) - set filetype=locate_prompt - syntax match Keyword /^>/ - setlocal winfixheight - setlocal nonumber - setlocal nolist - setlocal noswapfile nobuflisted - setlocal buftype=nofile bufhidden=delete - - let b:bufnum = bufnum - let b:project = a:project - let b:workspace = a:workspace - let b:scope = a:scope - let b:results_bufnum = results_bufnum - let b:help_bufnum = 0 - let b:selection = 1 - let b:winrestcmd = winrestcmd - - set updatetime=300 - - augroup locate_file_init - autocmd! - autocmd BufEnter nested startinsert! | let &updatetime = 300 - autocmd BufLeave \[Locate*\] - \ call eclim#util#DelayedCommand('call eclim#common#locate#LocateFileClose()') - exec 'autocmd InsertLeave ' . - \ 'let &updatetime = g:eclim_locate_default_updatetime | ' . - \ 'doautocmd BufWinLeave | bw | ' . - \ 'doautocmd BufWinLeave | bw ' . b:results_bufnum . ' | ' . - \ 'call eclim#util#GoToBufferWindow(' . b:bufnum . ') | ' . - \ 'doautocmd BufEnter | ' . - \ 'doautocmd WinEnter | ' . - \ winrestcmd - exec 'autocmd WinEnter ' - \ 'exec bufwinnr(' . bufnr('%') . ') "winc w"' - augroup END - - " enable completion after user starts typing - call s:LocateFileCompletionAutocmdDeferred() - - imap =LocateFileSelection("n") - imap =LocateFileSelection("n") - imap =LocateFileSelection("p") - imap =LocateFileSelection("p") - exec 'imap ' . - \ '=LocateFileSelect("' . a:action . '")' - imap =LocateFileSelect('edit') - imap =LocateFileSelect('split') - imap =LocateFileSelect("tablast \| tabnew") - imap =LocateFileChangeScope() - imap =LocateFileHelp() - - startinsert! -endfunction " }}} - -function! s:LocateFileCompletionAutocmd() " {{{ - augroup locate_file - autocmd! - autocmd CursorHoldI call eclim#common#locate#LocateFileCompletion() - augroup END -endfunction " }}} - -function! s:LocateFileCompletionAutocmdDeferred() " {{{ - augroup locate_file - autocmd! - autocmd CursorMovedI call LocateFileCompletionAutocmd() - augroup END -endfunction " }}} - -function! s:LocateFileSelection(sel) " {{{ - " pause completion while tabbing though results - augroup locate_file - autocmd! - augroup END - - let sel = a:sel - let prev_sel = b:selection - - " bad hack for gvim on windows - let start_sel = b:start_selection - let double_defer = 0 - if sel =~ '^[np]$' && (has('win32') || has('win64')) - let double_defer = b:start_selection == 1 - let b:start_selection = 0 - endif - - let winnr = winnr() - noautocmd exec bufwinnr(b:results_bufnum) . 'winc w' - - if sel == 'n' - let sel = prev_sel < line('$') ? prev_sel + 1 : 1 - elseif sel == 'p' - let sel = prev_sel > 1 ? prev_sel - 1 : line('$') - endif - - syntax clear - exec 'syntax match PmenuSel /\%' . sel . 'l.*/' - exec 'call cursor(' . sel . ', 1)' - let save_scrolloff = &scrolloff - let &scrolloff = 5 - normal! zt - let &scrolloff = save_scrolloff - - exec winnr . 'winc w' - - exec 'let b:selection = ' . sel - - if double_defer - augroup locate_file - autocmd! - autocmd CursorMovedI call LocateFileCompletionAutocmdDeferred() - augroup END - else - call s:LocateFileCompletionAutocmdDeferred() - endif - - return '' -endfunction " }}} - -function! s:LocateFileSelect(action) " {{{ - if exists('b:completions') && !empty(b:completions) - let &updatetime = g:eclim_locate_default_updatetime - - let file = eclim#util#Simplify(b:completions[b:selection - 1].info) - if has('win32unix') - let file = eclim#cygwin#CygwinPath(file) - endif - - let bufnum = b:bufnum - let winrestcmd = b:winrestcmd - - " close locate windows - exec 'bdelete ' . b:results_bufnum - exec 'bdelete ' . bufnr('%') - - " reset windows to pre-locate sizes - exec winrestcmd - - " open the selected result - call eclim#util#GoToBufferWindow(bufnum) - call eclim#util#GoToBufferWindowOrOpen(file, a:action) - call feedkeys("\", 'n') - doautocmd WinEnter - endif - return '' -endfunction " }}} - -function! s:LocateFileChangeScope() " {{{ - if b:help_bufnum && bufexists(b:help_bufnum) - exec 'bdelete ' . b:help_bufnum - endif - - let bufnr = bufnr('%') - let winnr = winnr() - - " trigger [Locate] buffer's BufLeave autocmd before we leave the buffer - doautocmd BufLeave - - noautocmd exec bufwinnr(b:results_bufnum) . 'winc w' - silent noautocmd exec '50vnew [Locate\ Scope]' - - let b:locate_bufnr = bufnr - let b:locate_winnr = winnr - stopinsert - setlocal modifiable - call append(1, s:scopes + g:EclimLocateUserScopes) - 1,1delete _ - call append(line('$'), - \ ['', '" - select a scope', '" , , or q - cancel']) - syntax match Comment /^".*/ - setlocal nomodifiable - setlocal winfixheight - setlocal nonumber - setlocal nolist - setlocal noswapfile nobuflisted - setlocal buftype=nofile bufhidden=delete - - nnoremap :call ChooseScope() - nnoremap q :call CloseScopeChooser() - nnoremap :call CloseScopeChooser() - nnoremap :call CloseScopeChooser() - - autocmd BufLeave call CloseScopeChooser() - - return '' -endfunction " }}} - -function! s:ChooseScope() " {{{ - let scope = getline('.') - if scope =~ '^"\|^\s*$' - return - endif - - let workspace = '' - let project = '' - let locate_in = scope - - if scope == 'project' - let project = '' - let names = eclim#project#util#GetProjectNames() - let prompt = 'Choose a project (ctrl-c to cancel): ' - while project == '' - let project = input( - \ prompt, '', 'customlist,eclim#project#util#CommandCompleteProject') - if project == '' - echo '' - return - endif - - if !eclim#util#ListContains(names, project) - let prompt = "Project '" . project . "' not found (ctrl-c to cancel): " - let project = '' - endif - endwhile - let locate_in = project - let workspace = eclim#project#util#GetProjectWorkspace(project) - - elseif scope == 'workspace' - let project = '' - let instance = eclim#client#nailgun#ChooseEclimdInstance() - if type(instance) != g:DICT_TYPE - return - endif - let workspace = instance.workspace - endif - - call s:CloseScopeChooser() - - let b:scope = scope - let b:project = project - let b:workspace = workspace != '' ? workspace : b:workspace - - exec 'file ' . escape('[Locate in ' . locate_in . ']', ' ') - - call eclim#common#locate#LocateFileCompletion() -endfunction " }}} - -function! s:CloseScopeChooser() " {{{ - let winnum = b:locate_winnr - bwipeout - exec winnum . 'winc w' - - " hack to make :q work like the other close mappings - doautocmd BufEnter - " if we end up in a non-Locate window, make sure everything is as it should - " be (a hack for the above hack). - augroup locate_file_chooser_hack - autocmd! - autocmd BufEnter * - \ if bufname('%') !~ '^\[Locate in .*\]$' | - \ call eclim#common#locate#LocateFileClose() | - \ endif | - \ autocmd! locate_file_chooser_hack - augroup END -endfunction " }}} - -function! s:LocateFileHelp() " {{{ - let winnr = winnr() - noautocmd exec bufwinnr(b:results_bufnum) . 'winc w' - let help_bufnum = eclim#help#BufferHelp(s:help, 'vertical', 50) - exec winnr . 'winc w' - let b:help_bufnum = help_bufnum - - return '' -endfunction " }}} - -function! s:LocateFileConvertPattern(pattern, fuzzy) " {{{ - let pattern = a:pattern - - if a:fuzzy - let pattern = '.*' . substitute(pattern, '\(.\)', '\1.*?', 'g') - let pattern = substitute(pattern, '\.\([^*]\)', '\\.\1', 'g') - else - " if the user supplied a path, prepend a '.*/' to it so that they don't need - " to type full paths to match. - if pattern =~ '.\+/' - let pattern = '.*/' . pattern - endif - let pattern = substitute(pattern, '\*\*', '.*', 'g') - let pattern = substitute(pattern, '\(^\|\([^.]\)\)\*', '\1[^/]*?', 'g') - let pattern = substitute(pattern, '\.\([^*]\)', '\\.\1', 'g') - "let pattern = substitute(pattern, '\([^*]\)?', '\1.', 'g') - let pattern .= '.*' - endif - - return pattern -endfunction " }}} - -function! s:LocateFileFunction(scope) " {{{ - if eclim#util#ListContains(s:scopes, a:scope) - return function('s:LocateFile_' . a:scope) - endif - return function('LocateFile_' . a:scope) -endfunction " }}} - -function! s:LocateFileCommand(pattern) " {{{ - let command = s:command_locate - if g:EclimLocateFileCaseInsensitive == 'always' || - \ (a:pattern !~# '[A-Z]' && g:EclimLocateFileCaseInsensitive != 'never') - let command .= ' -i' - endif - let command .= ' -p "' . a:pattern . '"' - return command -endfunction " }}} - -function! s:LocateFile_workspace(pattern) " {{{ - let command = substitute(s:LocateFileCommand(a:pattern), '', 'workspace', '') - let results = eclim#Execute(command, {'workspace': b:workspace}) - if type(results) != g:LIST_TYPE - return [] - endif - return results -endfunction " }}} - -function! s:LocateFile_project(pattern) " {{{ - let command = substitute(s:LocateFileCommand(a:pattern), '', 'project', '') - let command .= ' -n "' . b:project . '"' - let results = eclim#Execute(command, {'workspace': b:workspace}) - if type(results) != g:LIST_TYPE - return [] - endif - return results -endfunction " }}} - -function! s:LocateFile_buffers(pattern) " {{{ - redir => list - silent exec 'buffers' - redir END - - let buffers = map(split(list, '\n'), - \ "substitute(v:val, '.\\{-}\"\\(.\\{-}\\)\".*', '\\1', '')") - if a:pattern =~ '/' - let buffers = map(buffers, "fnamemodify(v:val, ':p')") - endif - - if len(buffers) > 0 - let tempfile = substitute(tempname(), '\', '/', 'g') - call writefile(buffers, tempfile) - try - return eclim#common#locate#LocateFileFromFileList(a:pattern, tempfile) - finally - call delete(tempfile) - endtry - endif - return [] -endfunction " }}} - -function! s:LocateFile_quickfix(pattern) " {{{ - let buffers = [] - let prev = '' - for entry in getqflist() - let name = bufname(entry.bufnr) - if a:pattern =~ '/' - let name = fnamemodify(name, ':p') - endif - if name != prev - call add(buffers, name) - let prev = name - endif - endfor - - if len(buffers) > 0 - let tempfile = substitute(tempname(), '\', '/', 'g') - call writefile(buffers, tempfile) - try - return eclim#common#locate#LocateFileFromFileList(a:pattern, tempfile) - finally - call delete(tempfile) - endtry - endif - return [] -endfunction " }}} - -function! eclim#common#locate#LocateFileFromFileList(pattern, file) " {{{ - let file = a:file - if has('win32unix') - let file = eclim#cygwin#WindowsPath(file) - endif - if eclim#EclimAvailable() - let command = substitute(s:LocateFileCommand(a:pattern), '', 'list', '') - let command .= ' -f "' . file . '"' - let results = eclim#Execute(command, {'workspace': b:workspace}) - if type(results) != g:LIST_TYPE - return [] - endif - else - let results = [] - for result in readfile(file) - call add(results, {'name': fnamemodify(result, ':t'), 'path': result}) - endfor - endif - - return results -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/template.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/template.vim deleted file mode 100644 index c569928..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/template.vim +++ /dev/null @@ -1,237 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" -" License: -" -" Copyright (C) 2005 - 2012 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ -if !exists("g:EclimTemplateDir") - let g:EclimTemplateDir = g:EclimBaseDir . '/template' -endif -if !exists("g:EclimTemplateExtension") - let g:EclimTemplateExtension = '.vim' -endif -if !exists("g:EclimTemplateIgnore") - let g:EclimTemplateIgnore = [] -endif -" }}} - -" Script Variables {{{ -let s:quote = "['\"]" -let s:tag_regex = - \ '' -let s:tagname_regex = '.\{-} 0 - let ext = strpart(filename, stridx(filename, '.')) - while stridx(ext, '.') != -1 - let ext = strpart(ext, stridx(ext, '.') + 1) - if filereadable(templatesDir . '/' . ext . g:EclimTemplateExtension) - return templatesDir . '/' . ext . g:EclimTemplateExtension - endif - endwhile - endif - - " template equal to file type - if filereadable(templatesDir . '/' . &ft . g:EclimTemplateExtension) - return templatesDir . '/' . &ft . g:EclimTemplateExtension - endif - - return '' -endfunction " }}} - -" s:ExecuteTemplate(lines) {{{ -" Executes any logic in the supplied lines and appends those lines to the -" current file. -function! s:ExecuteTemplate(lines) - for line in a:lines - if line =~ s:tag_regex - let tag = substitute(line, s:tagname_regex, '\1', '') - call s:ExecuteTemplate(s:Process_{tag}(line)) - else - call append(line('$'), line) - endif - endfor -endfunction " }}} - -" s:EvaluateExpression(expression) {{{ -" Evaluates the supplied expression. -function! s:EvaluateExpression(expression) - exec "return " . a:expression -endfunction " }}} - -" s:GetAttribute(line, tag, attribute, fail) {{{ -" Gets the an attribute value. -function! s:GetAttribute(line, tag, attribute, fail) - let attribute = substitute(a:line, - \ '.\{-}.*', - \ '\2', '') - - if attribute == a:line - if a:fail - call s:TemplateError( - \ a:line, "syntax error - missing '" . a:attribute . "' attribute") - endif - return "" - endif - return attribute -endfunction " }}} - -" s:TemplateError(line, message) {{{ -" Echos an error message to the user. -function! s:TemplateError(line, message) - call eclim#util#EchoError("Template error, line " . a:line . ": " . a:message) -endfunction " }}} - -" s:Process_var(line) {{{ -" Process tags. -function! s:Process_var(line) - let name = expand(s:GetAttribute(a:line, 'var', 'name', 1)) - let value = expand(s:GetAttribute(a:line, 'var', 'value', 1)) - - exec "let " . name . " = \"" . s:EvaluateExpression(value) . "\"" - - return [] -endfunction " }}} - -" s:Process_import(line) {{{ -" Process tags. -function! s:Process_import(line) - let resource = expand(s:GetAttribute(a:line, 'import', 'resource', 1)) - if resource !~ '^/\' - let resource = expand(g:EclimTemplateDir . '/' . resource) - endif - - if !filereadable(resource) - call s:TemplateError(a:line, "resource not found '" . resource . "'") - endif - - exec "source " . resource - - return [] -endfunction " }}} - -" s:Process_out(line) {{{ -" Process tags. -function! s:Process_out(line) - let value = s:GetAttribute(a:line, 'out', 'value', 1) - let result = s:EvaluateExpression(value) - return s:Out(a:line, '', result) -endfunction " }}} - -" s:Process_include(line) {{{ -" Process tags. -function! s:Process_include(line) - let template = expand( - \ g:EclimTemplateDir . '/' . s:GetAttribute(a:line, 'include', 'template', 1)) - - if !filereadable(template) - call s:TemplateError(a:line, "template not found '" . template . "'") - return [] - endif - - return readfile(template) -endfunction " }}} - -" s:Process_username(line) {{{ -" Process tags. -function! s:Process_username(line) - silent! let username = eclim#project#util#GetProjectSetting('org.eclim.user.name') - if type(username) == g:NUMBER_TYPE - let username = '' - endif - return s:Out(a:line, '', username) -endfunction " }}} - -" s:Out(line, pattern, value) {{{ -function! s:Out(line, pattern, value) - let results = type(a:value) == g:LIST_TYPE ? a:value : [a:value] - if results[0] == '' && a:line =~ '^\s*' . a:pattern . '\s*$' - return [] - endif - - let line = substitute(a:line, a:pattern, results[0], '') - return [line] + (len(results) > 1 ? results[1:] : []) -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/common/util.vim b/.vim/bundle/eclim/eclim/autoload/eclim/common/util.vim deleted file mode 100644 index 848a9a6..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/common/util.vim +++ /dev/null @@ -1,195 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Various functions that are useful in and out of eclim. -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ -let s:command_read = '-command archive_read -f ""' -" }}} - -" DiffLastSaved() {{{ -" Diff a modified file with the last saved version. -function! eclim#common#util#DiffLastSaved() - if &modified - let winnum = winnr() - let filetype=&ft - vertical botright new | r # - 1,1delete _ - - diffthis - setlocal buftype=nofile - setlocal bufhidden=wipe - setlocal nobuflisted - setlocal noswapfile - setlocal readonly - exec "setlocal ft=" . filetype - let diffnum = winnr() - - augroup diff_saved - autocmd! BufUnload - autocmd BufUnload :diffoff! - augroup END - - exec winnum . "winc w" - diffthis - - " for some reason, these settings only take hold if set here. - call setwinvar(diffnum, "&foldmethod", "diff") - call setwinvar(diffnum, "&foldlevel", "0") - else - echo "No changes" - endif -endfunction " }}} - -" SwapTypedArguments() {{{ -" Swaps typed method declaration arguments. -function! eclim#common#util#SwapTypedArguments() - " FIXME: add validation to see if user is executing on a valid position. - normal! w - SwapWords - normal! b - SwapWords - normal! www - SwapWords - normal! bb - SwapWords - normal! b -endfunction " }}} - -" SwapWords() {{{ -" Initially based on http://www.vim.org/tips/tip.php?tip_id=329 -function! eclim#common#util#SwapWords() - " save the last search pattern - let save_search = @/ - - normal! "_yiw - s/\(\%#\w\+\)\(\_W\+\)\(\w\+\)/\3\2\1/ - exec "normal! \" - - " restore the last search pattern - let @/ = save_search - - silent! call repeat#set(":call eclim#common#util#SwapWords()\", v:count) -endfunction " }}} - -" Tcd(dir) {{{ -" Like vim's :lcd, but tab local instead of window local. -function! eclim#common#util#Tcd(dir) - let t:cwd = fnamemodify(a:dir, ':p') - - " initialize the tab cwd for all other tabs if not already set - let curtab = tabpagenr() - try - let index = 1 - while index <= tabpagenr('$') - if index != curtab - exec 'tabn ' . index - if !exists('t:cwd') - let t:cwd = getcwd() - " try to find a window without a localdir if necessary - if haslocaldir() - let curwin = winnr() - let windex = 1 - while windex <= winnr('$') - if windex != curwin - exec windex . 'winc w' - if !haslocaldir() - let t:cwd = getcwd() - break - endif - endif - let windex += 1 - endwhile - exec curwin . 'winc w' - endif - endif - endif - let index += 1 - endwhile - finally - exec 'tabn ' . curtab - endtry - - call s:ApplyTcd(0) - - augroup tcd - autocmd! - autocmd TabEnter * call ApplyTcd(1) - augroup END -endfunction " }}} - -" s:ApplyTcd(honor_lcd) {{{ -function! s:ApplyTcd(honor_lcd) - if !exists('t:cwd') - return - endif - - if a:honor_lcd && haslocaldir() - let lcwd = getcwd() - exec 'cd ' . escape(t:cwd, ' ') - exec 'lcd ' . escape(lcwd, ' ') - else - exec 'cd ' . escape(t:cwd, ' ') - endif -endfunction " }}} - -" ReadFile() {{{ -" Reads the contents of an archived file. -function! eclim#common#util#ReadFile() - let archive = substitute(expand('%'), '\', '/', 'g') - let command = substitute(s:command_read, '', archive, '') - - let file = eclim#Execute(command) - - if string(file) != '0' - let project = exists('b:eclim_project') ? b:eclim_project : '' - let bufnum = bufnr('%') - if has('win32unix') - let file = eclim#cygwin#CygwinPath(file) - endif - silent exec "keepalt keepjumps edit! " . escape(file, ' ') - if project != '' - let b:eclim_project = project - let b:eclim_file = archive - endif - - exec 'bdelete ' . bufnum - - " alternate solution, that keeps the archive url as the buffer's filename, - " but prevents taglist from being able to parse tags. - "setlocal noreadonly - "setlocal modifiable - "silent! exec "read " . file - "1,1delete _ - - silent exec "doautocmd BufReadPre " . file - silent exec "doautocmd BufReadPost " . file - - setlocal readonly - setlocal nomodifiable - setlocal noswapfile - " causes taglist.vim errors (fold then delete fails) - "setlocal bufhidden=delete - endif -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/cygwin.vim b/.vim/bundle/eclim/eclim/autoload/eclim/cygwin.vim deleted file mode 100644 index b313c7d..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/cygwin.vim +++ /dev/null @@ -1,60 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Utility functions for cygwin usage. -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -function! eclim#cygwin#CygwinPath(path) " {{{ - return s:Cygpath(a:path, 'cygwin') -endfunction " }}} - -function! eclim#cygwin#WindowsPath(path) " {{{ - if type(a:path) == g:STRING_TYPE && a:path =~? '^[a-z]:' - return substitute(a:path, '\', '/', 'g') - endif - return s:Cygpath(a:path, 'windows') -endfunction " }}} - -function! eclim#cygwin#WindowsHome() " {{{ - if !exists('s:cygpath_winhome') - let dir = s:Cygpath('-D', 'cygwin') - let s:cygpath_winhome = dir != '-D' ? fnamemodify(dir, ':h') : '' - endif - return s:cygpath_winhome -endfunction " }}} - -function! s:Cygpath(paths, type) " {{{ - if executable('cygpath') - let paths = type(a:paths) == g:LIST_TYPE ? a:paths : [a:paths] - let paths = map(paths, "'\"' . substitute(v:val, '\\', '/', 'g') . '\"'") - - let args = a:type == 'windows' ? '-m ' : '' - let results = split(eclim#util#System('cygpath ' . args . join(paths)), "\n") - - if type(a:paths) == g:LIST_TYPE - return results - endif - return results[0] - endif - return a:paths -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/display/menu.vim b/.vim/bundle/eclim/eclim/autoload/eclim/display/menu.vim deleted file mode 100644 index add50f8..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/display/menu.vim +++ /dev/null @@ -1,103 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Plugin to generate gvim eclim menus. -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Script Variables {{{ - -let s:eclim_menus_root = [] -let s:eclim_menus = {} - -" }}} - -" Generate() {{{ -" Generate gvim menu items for available eclim commands. -function! eclim#display#menu#Generate() - " check that the menu bar is enabled or that we are running in a mac gui where - " the menu bar always exists regardless of guioptions - if &guioptions !~ 'm' && !has('gui_macvim') - if exists('b:eclim_menus') - unlet b:eclim_menus - endif - return - endif - - redir => commands - silent exec 'command' - redir END - - if !exists('b:eclim_menus') - let b:eclim_menus = {} - - let pattern = '\. -" -" }}} - -" Global Variables {{{ -if !exists("g:EclimShowQuickfixSigns") - let g:EclimShowQuickfixSigns = 1 -endif - -if !exists("g:EclimShowLoclistSigns") - let g:EclimShowLoclistSigns = 1 -endif - -if !exists("g:EclimQuickfixSignText") - let g:EclimQuickfixSignText = '> ' -endif - -if !exists("g:EclimLoclistSignText") - let g:EclimLoclistSignText = '>>' -endif - -if !exists("g:EclimUserSignText") - let g:EclimUserSignText = '#' -endif - -if !exists("g:EclimUserSignHighlight") - let g:EclimUserSignHighlight = g:EclimInfoHighlight -endif -" }}} - -function! eclim#display#signs#Define(name, text, highlight) " {{{ - " Defines a new sign name or updates an existing one. - exec "sign define " . a:name . " text=" . a:text . " texthl=" . a:highlight -endfunction " }}} - -function! eclim#display#signs#Place(name, line) " {{{ - " Places a sign in the current buffer. - if a:line > 0 - let lastline = line('$') - let line = a:line <= lastline ? a:line : lastline - let id = a:name == 'placeholder' ? 999999 : line - exec "sign place " . id . " line=" . line . " name=" . a:name . - \ " buffer=" . bufnr('%') - endif -endfunction " }}} - -function! eclim#display#signs#PlaceAll(name, list) " {{{ - " Places a sign in the current buffer for each line in the list. - - let lastline = line('$') - for line in a:list - if line > 0 - let line = line <= lastline ? line : lastline - exec "sign place " . line . " line=" . line . " name=" . a:name . - \ " buffer=" . bufnr('%') - endif - endfor -endfunction " }}} - -function! eclim#display#signs#Undefine(name) " {{{ - " Undefines a sign name. - exec "sign undefine " . a:name -endfunction " }}} - -function! eclim#display#signs#Unplace(id) " {{{ - " Un-places a sign in the current buffer. - exec 'sign unplace ' . a:id . ' buffer=' . bufnr('%') -endfunction " }}} - -function! eclim#display#signs#UnplaceAll(list) " {{{ - " Un-places all signs in the supplied list from the current buffer. - " The list may be a list of ids or a list of dictionaries as returned by - " GetExisting() - - for sign in a:list - if type(sign) == g:DICT_TYPE - call eclim#display#signs#Unplace(sign['id']) - else - call eclim#display#signs#Unplace(sign) - endif - endfor -endfunction " }}} - -function! eclim#display#signs#Toggle(name, line) " {{{ - " Toggle a sign on the current line. - if a:line > 0 - let existing = eclim#display#signs#GetExisting(a:name) - let exists = len(filter(existing, "v:val['line'] == a:line")) - if exists - call eclim#display#signs#Unplace(a:line) - else - call eclim#display#signs#Place(a:name, a:line) - endif - endif -endfunction " }}} - -function! s:CompareSigns(s1, s2) " {{{ - " Used by ViewSigns to sort list of sign dictionaries. - - if a:s1.line == a:s2.line - return 0 - endif - if a:s1.line > a:s2.line - return 1 - endif - return -1 -endfunction " }}} - -function! eclim#display#signs#ViewSigns(name) " {{{ - " Open a window to view all placed signs with the given name in the current - " buffer. - - let filename = expand('%:p') - let signs = eclim#display#signs#GetExisting(a:name) - call sort(signs, 's:CompareSigns') - let content = map(signs, "v:val.line . '|' . getline(v:val.line)") - - call eclim#util#TempWindow('[Sign List]', content) - - set ft=qf - nnoremap :call JumpToSign() - - " Store filename so that plugins can use it if necessary. - let b:filename = filename - augroup temp_window - autocmd! BufWinLeave - call eclim#util#GoToBufferWindowRegister(filename) - augroup END -endfunction " }}} - -function! s:JumpToSign() " {{{ - let winnr = bufwinnr(bufnr('^' . b:filename)) - if winnr != -1 - let line = substitute(getline('.'), '^\(\d\+\)|.*', '\1', '') - exec winnr . "winc w" - call cursor(line, 1) - endif -endfunction " }}} - -function! eclim#display#signs#GetDefined() " {{{ - " Gets a list of defined sign names. - - redir => list - silent exec 'sign list' - redir END - - let names = [] - for name in split(list, '\n') - let name = substitute(name, 'sign\s\(.\{-}\)\s.*', '\1', '') - call add(names, name) - endfor - return names -endfunction " }}} - -function! eclim#display#signs#GetExisting(...) " {{{ - " Gets a list of existing signs for the current buffer. - " The list consists of dictionaries with the following keys: - " id: The sign id. - " line: The line number. - " name: The sign name (erorr, warning, etc.) - " - " Optionally a sign name may be supplied to only retrieve signs of that name. - - let bufnr = bufnr('%') - - redir => signs - silent exec 'sign place buffer=' . bufnr - redir END - - let existing = [] - for line in split(signs, '\n') - if line =~ '.\{-}=.\{-}=' " only two equals to account for swedish output - call add(existing, s:ParseSign(line)) - endif - endfor - - if len(a:000) > 0 - call filter(existing, "v:val['name'] == a:000[0]") - endif - - return existing -endfunction " }}} - -function! eclim#display#signs#HasExisting(...) " {{{ - " Determines if there are any existing signs. - " Optionally a sign name may be supplied to only test for signs of that name. - - let bufnr = bufnr('%') - - redir => results - silent exec 'sign place buffer=' . bufnr - redir END - - for line in split(results, '\n') - if line =~ '.\{-}=.\{-}=' " only two equals to account for swedish output - if len(a:000) == 0 - return 1 - endif - let sign = s:ParseSign(line) - if sign.name == a:000[0] - return 1 - endif - endif - endfor - - return 0 -endfunction " }}} - -function! s:ParseSign(raw) " {{{ - let attrs = split(a:raw) - - exec 'let line = ' . split(attrs[0], '=')[1] - - let id = split(attrs[1], '=')[1] - " hack for the italian localization - if id =~ ',$' - let id = id[:-2] - endif - - " hack for the swedish localization - if attrs[2] =~ '^namn' - let name = substitute(attrs[2], 'namn', '', '') - else - let name = split(attrs[2], '=')[1] - endif - - return {'id': id, 'line': line, 'name': name} -endfunction " }}} - -function! eclim#display#signs#Update() " {{{ - " Updates the signs for the current buffer. This function will read both the - " location list and the quickfix list and place a sign for any entries for the - " current file. - " This function supports a severity level by examining the 'type' key of the - " dictionaries in the location or quickfix list. It supports 'i' (info), 'w' - " (warning), and 'e' (error). - - if !has('signs') || !g:EclimSignLevel || &ft == 'qf' - return - endif - - let save_lazy = &lazyredraw - set lazyredraw - - let placeholder = eclim#display#signs#SetPlaceholder() - - " remove all existing signs - let existing = eclim#display#signs#GetExisting() - for exists in existing - if exists.name =~ '^\(qf_\)\?\(error\|info\|warning\)$' - call eclim#display#signs#Unplace(exists.id) - endif - endfor - - let qflist = filter(g:EclimShowQuickfixSigns ? getqflist() : [], - \ 'bufnr("%") == v:val.bufnr') - let show_loclist = g:EclimShowLoclistSigns && exists('b:eclim_loclist') - let loclist = filter(show_loclist ? getloclist(0) : [], - \ 'bufnr("%") == v:val.bufnr') - - for [list, marker, prefix] in [ - \ [qflist, g:EclimQuickfixSignText, 'qf_'], - \ [loclist, g:EclimLoclistSignText, '']] - if g:EclimSignLevel >= 4 - let info = filter(copy(list), 'v:val.type == "" || tolower(v:val.type) == "i"') - call eclim#display#signs#Define(prefix . 'info', marker, g:EclimInfoHighlight) - call eclim#display#signs#PlaceAll(prefix . 'info', map(info, 'v:val.lnum')) - endif - - if g:EclimSignLevel >= 3 - let warnings = filter(copy(list), 'tolower(v:val.type) == "w"') - call eclim#display#signs#Define(prefix . 'warning', marker, g:EclimWarningHighlight) - call eclim#display#signs#PlaceAll(prefix . 'warning', map(warnings, 'v:val.lnum')) - endif - - if g:EclimSignLevel >= 2 - let errors = filter(copy(list), 'tolower(v:val.type) == "e"') - call eclim#display#signs#Define(prefix . 'error', marker, g:EclimErrorHighlight) - call eclim#display#signs#PlaceAll(prefix . 'error', map(errors, 'v:val.lnum')) - endif - endfor - - if placeholder - call eclim#display#signs#RemovePlaceholder() - endif - - let &lazyredraw = save_lazy -endfunction " }}} - -function! eclim#display#signs#QuickFixCmdPost() " {{{ - " Force 'make' results to be of type error if no type set. - if expand('') == 'make' - let newentries = [] - for entry in getqflist() - if entry['type'] == '' - let entry['type'] = 'e' - endif - call add(newentries, entry) - endfor - call setqflist(newentries, 'r') - endif - call eclim#display#signs#Update() - redraw! -endfunction " }}} - -function! eclim#display#signs#SetPlaceholder(...) " {{{ - " Set sign at line 1 to prevent sign column from collapsing, and subsiquent - " screen redraw. - " Optional args: - " only_if_necessary: if 1, only set a placeholder if there are no existing - " signs - - if !has('signs') || !g:EclimSignLevel - return - endif - - if len(a:000) > 0 && a:000[0] - let existing = eclim#display#signs#GetExisting() - if !len(existing) - return - endif - endif - - call eclim#display#signs#Define('placeholder', '_ ', g:EclimInfoHighlight) - let existing = eclim#display#signs#GetExisting('placeholder') - if len(existing) == 0 && eclim#display#signs#HasExisting() - call eclim#display#signs#Place('placeholder', 1) - return 1 - endif - return -endfunction " }}} - -function! eclim#display#signs#RemovePlaceholder() " {{{ - if !has('signs') || !g:EclimSignLevel - return - endif - - let existing = eclim#display#signs#GetExisting('placeholder') - for exists in existing - call eclim#display#signs#Unplace(exists.id) - endfor -endfunction " }}} - -" define signs for manually added user marks. -if has('signs') - call eclim#display#signs#Define( - \ 'user', g:EclimUserSignText, g:EclimUserSignHighlight) -endif - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/display/window.vim b/.vim/bundle/eclim/eclim/autoload/eclim/display/window.vim deleted file mode 100644 index 496b9bf..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/display/window.vim +++ /dev/null @@ -1,352 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Utility functions for working with vim windows. -" -" License: -" -" Copyright (C) 2005 - 2012 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" GlobalVariables {{{ -let g:VerticalToolBuffers = {} - -if !exists('g:VerticalToolWindowSide') - let g:VerticalToolWindowSide = 'left' -endif - -if g:VerticalToolWindowSide == 'right' - let g:VerticalToolWindowPosition = 'botright vertical' -else - let g:VerticalToolWindowPosition = 'topleft vertical' -endif - -if !exists('g:VerticalToolWindowWidth') - let g:VerticalToolWindowWidth = 30 -endif -" }}} - -function! eclim#display#window#VerticalToolWindowOpen(name, weight, ...) " {{{ - " Handles opening windows in the vertical tool window on the left (taglist, - " project tree, etc.) - - let taglist_window = -1 - if exists('g:TagList_title') - let taglist_window = bufwinnr(eclim#util#EscapeBufferName(g:TagList_title)) - let taglist_position = 'left' - if exists('g:Tlist_Use_Horiz_Window') && g:Tlist_Use_Horiz_Window - let taglist_position = 'horizontal' - elseif exists('g:TaglistTooPosition') - let taglist_position = g:TaglistTooPosition - elseif exists('g:Tlist_Use_Right_Window') && g:Tlist_Use_Right_Window - let taglist_position = 'right' - endif - endif - if taglist_window == -1 && exists(':TagbarOpen') - let taglist_window = bufwinnr('__Tagbar__') - let taglist_position = 'right' - if exists('g:tagbar_left') && g:tagbar_left - let taglist_position = 'left' - endif - endif - if taglist_window != -1 - " don't consider horizontal taglist, or taglist configured to display - " opposite the tool windows as a tool window member. - if taglist_position != g:VerticalToolWindowSide - let taglist_window = -1 - endif - endif - - - let relative_window = 0 - let relative_window_loc = 'below' - if taglist_window != -1 || len(g:VerticalToolBuffers) > 0 - if taglist_window != -1 - let relative_window = taglist_window - endif - for toolbuf in keys(g:VerticalToolBuffers) - exec 'let toolbuf = ' . toolbuf - if bufwinnr(toolbuf) != -1 - if relative_window == 0 - let relative_window = bufwinnr(toolbuf) - if getbufvar(toolbuf, 'weight') > a:weight - let relative_window_loc = 'below' - else - let relative_window_loc = 'above' - endif - elseif getbufvar(toolbuf, 'weight') > a:weight - let relative_window = bufwinnr(toolbuf) - let relative_window_loc = 'below' - endif - endif - endfor - endif - - if relative_window != 0 - let wincmd = relative_window . 'winc w | ' . relative_window_loc . ' ' - else - let wincmd = g:VerticalToolWindowPosition . ' ' . g:VerticalToolWindowWidth - endif - - let escaped = substitute( - \ a:name, '\(.\{-}\)\[\(.\{-}\)\]\(.\{-}\)', '\1[[]\2[]]\3', 'g') - if a:0 && a:1 - let bufnum = -1 - for bnr in tabpagebuflist() - if bufname(bnr) == a:name - let bufnum = bnr - break - endif - endfor - else - let bufnum = bufnr(escaped) - endif - let name = bufnum == -1 ? a:name : '+buffer' . bufnum - silent call eclim#util#ExecWithoutAutocmds(wincmd . ' split ' . name) - - doautocmd BufWinEnter - setlocal winfixwidth - setlocal nonumber - setlocal nospell norelativenumber - - let b:weight = a:weight - let bufnum = bufnr('%') - let g:VerticalToolBuffers[bufnum] = a:name - augroup eclim_vertical_tool_windows - autocmd! - autocmd BufDelete * call s:PreventCloseOnBufferDelete() - autocmd BufEnter * nested call s:CloseIfLastWindow() - augroup END - - if exists('g:TagList_title') && - \ (!exists('g:Tlist_Use_Horiz_Window') || !g:Tlist_Use_Horiz_Window) - augroup eclim_vertical_tool_windows_move_taglist - autocmd! - exec 'autocmd BufWinEnter ' . eclim#util#EscapeBufferName(g:TagList_title) . - \ ' call s:MoveRelativeTo()' - augroup END - endif - if exists(':TagbarOpen') - augroup eclim_vertical_tool_windows_move_tagbar - autocmd! - autocmd BufWinEnter __Tagbar__ call s:MoveRelativeTo() - augroup END - endif - augroup eclim_vertical_tool_windows_buffer - exec 'autocmd BufWinLeave ' . - \ 'silent! call remove(g:VerticalToolBuffers, ' . bufnum . ') | ' . - \ 'autocmd! eclim_vertical_tool_windows_buffer * ' - augroup END -endfunction " }}} - -function! eclim#display#window#VerticalToolWindowRestore() " {{{ - " Used to restore the tool windows to their proper width if some action - " altered them. - - for toolbuf in keys(g:VerticalToolBuffers) - exec 'let toolbuf = ' . toolbuf - if bufwinnr(toolbuf) != -1 - exec 'vertical ' . bufwinnr(toolbuf) . 'resize ' . g:VerticalToolWindowWidth - endif - endfor -endfunction " }}} - -function! eclim#display#window#GetWindowOptions(winnum) " {{{ - " Gets a dictionary containing all the localy set options for the specified - " window. - - let curwin = winnr() - try - exec a:winnum . 'winc w' - redir => list - silent exec 'setlocal' - redir END - finally - exec curwin . 'winc w' - endtry - - let list = substitute(list, '---.\{-}---', '', '') - let winopts = {} - for wopt in split(list, '\(\n\|\s\s\+\)')[1:] - if wopt =~ '^[a-z]' - if wopt =~ '=' - let key = substitute(wopt, '\(.\{-}\)=.*', '\1', '') - let value = substitute(wopt, '.\{-}=\(.*\)', '\1', '') - let winopts[key] = value - else - let winopts[wopt] = '' - endif - endif - endfor - return winopts -endfunction " }}} - -function! eclim#display#window#SetWindowOptions(winnum, options) " {{{ - " Given a dictionary of options, sets each as local options for the specified - " window. - - let curwin = winnr() - try - exec a:winnum . 'winc w' - for key in keys(a:options) - if key =~ '^no' - silent! exec 'setlocal ' . key - else - silent! exec 'setlocal ' . key . '=' . escape(a:options[key], ' ') - endif - endfor - finally - exec curwin . 'winc w' - endtry -endfunction " }}} - -function! s:CloseIfLastWindow() " {{{ - if histget(':', -1) !~ '^bd' - let close = 1 - for bufnr in tabpagebuflist() - if has_key(g:VerticalToolBuffers, bufnr) - continue - endif - if exists('g:TagList_title') && bufname(bufnr) == g:TagList_title - continue - endif - if exists('g:BufExplorer_title') && bufname(bufnr) == '[BufExplorer]' - let close = 0 - break - endif - - let buftype = getbufvar(bufnr, '&buftype') - if buftype != '' && buftype != 'help' - continue - endif - - let close = 0 - break - endfor - - if close - if tabpagenr('$') > 1 - tabclose - else - quitall - endif - endif - endif -endfunction " }}} - -function! s:MoveRelativeTo() " {{{ - " get the buffer that the taglist was opened from - let curwin = winnr() - let list_buffer = bufnr('%') - winc p - let orig_buffer = bufnr('%') - exec curwin . 'winc p' - - for toolbuf in keys(g:VerticalToolBuffers) - exec 'let toolbuf = ' . toolbuf - if bufwinnr(toolbuf) != -1 - call setwinvar(bufwinnr(toolbuf), 'marked_for_removal', 1) - let winoptions = eclim#display#window#GetWindowOptions(bufwinnr(toolbuf)) - call remove(winoptions, 'filetype') - call remove(winoptions, 'syntax') - call eclim#display#window#VerticalToolWindowOpen( - \ g:VerticalToolBuffers[toolbuf], getbufvar(toolbuf, 'weight')) - call eclim#display#window#SetWindowOptions(winnr(), winoptions) - endif - endfor - - let winnum = 1 - while winnum <= winnr('$') - if getwinvar(winnum, 'marked_for_removal') == 1 - exec winnum . 'winc w' - close - else - let winnum += 1 - endif - endwhile - call eclim#display#window#VerticalToolWindowRestore() - - " some window juggling so that winc p from taglist goes back to the original - " buffer - exec bufwinnr(orig_buffer) . 'winc w' - exec bufwinnr(list_buffer) . 'winc w' -endfunction " }}} - -function! s:PreventCloseOnBufferDelete() " {{{ - let index = 1 - let numtoolwindows = 0 - let numtempwindows = 0 - let tempbuffersbot = [] - while index <= winnr('$') - let buf = winbufnr(index) - let bufname = bufname(buf) - if index(keys(g:VerticalToolBuffers), string(buf)) != -1 - let numtoolwindows += 1 - elseif getwinvar(index, '&winfixheight') || getwinvar(index, '&winfixwidth') - let numtempwindows += 1 - if getwinvar(index, '&winfixheight') - call add(tempbuffersbot, buf) - endif - endif - let index += 1 - endwhile - - if winnr('$') == (numtoolwindows + numtempwindows) - let toolbuf = bufnr('%') - if g:VerticalToolWindowSide == 'right' - vertical topleft new - else - vertical botright new - endif - setlocal noreadonly modifiable - let curbuf = bufnr('%') - let removed = str2nr(expand('')) - let next = eclim#common#buffers#OpenNextHiddenTabBuffer(removed) - if next != 0 - let curbuf = next - endif - - " resize windows - exec bufwinnr(toolbuf) . 'winc w' - exec 'vertical resize ' . g:VerticalToolWindowWidth - - " fix the position of the temp windows - for buf in tempbuffersbot - " open the buffer in the temp window position - botright 10new - exec 'buffer ' . buf - setlocal winfixheight - - " close the old window - let winnr = winnr() - let index = 1 - while index <= winnr('$') - if winbufnr(index) == buf && index != winnr - exec index . 'winc w' - close - winc p - break - endif - let index += 1 - endwhile - endfor - - exec bufwinnr(curbuf) . 'winc w' - endif -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/help.vim b/.vim/bundle/eclim/eclim/autoload/eclim/help.vim deleted file mode 100644 index 5d2dc1b..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/help.vim +++ /dev/null @@ -1,169 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Commands view / search eclim help files. -" -" License: -" -" Copyright (C) 2005 - 2013 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" Global Variables {{{ - let g:EclimHelpDir = g:EclimBaseDir . '/eclim/doc' -" }}} - -" Help(tag) {{{ -function! eclim#help#Help(tag, link) - if !filereadable(substitute(g:EclimHelpDir, '\\\s', ' ', 'g') . '/tags') - call eclim#util#Echo('indexing eclim help files...') - exec 'helptags ' . g:EclimHelpDir - let paths = split(glob(g:EclimHelpDir . '/**/*'), '\n') - call filter(paths, 'isdirectory(v:val)') - for path in paths - exec 'helptags ' . path - endfor - call eclim#util#Echo('eclim help files indexed') - endif - - let savetags = &tags - exec 'set tags=' . escape(escape(g:EclimHelpDir, ' '), ' ') . '/**/tags' - try - let tag = a:tag - if tag == '' && !a:link - let tag = 'index' - elseif tag =='' - let line = getline('.') - let tag = substitute( - \ line, '.*|\(\S\{-}\%' . col('.') . 'c\S\{-}\)|.*', '\1', '') - if tag == line - return - endif - endif - - call s:HelpWindow() - exec 'tag ' . tag - let w:eclim_help = 1 - - " needed to ensure taglist is updated if open - doautocmd BufEnter - catch /^Vim\%((\a\+)\)\=:E426/ - if !exists('w:eclim_help') - close - endif - call eclim#util#EchoError('Sorry no eclim help for ' . tag) - finally - let &tags = savetags - endtry -endfunction " }}} - -" HelpGrep() {{{ -function! eclim#help#HelpGrep(args) - exec 'vimgrep ' a:args . ' ' . g:EclimHelpDir . '/**/*.txt' -endfunction " }}} - -" s:HelpWindow() {{{ -function s:HelpWindow() - let max = winnr('$') - let index = 1 - while index <= max - if getwinvar(index, 'eclim_help') - exec index . 'winc w' - return - endif - let index += 1 - endwhile - - new -endfunction " }}} - -" BufferHelp(lines, orientation, size) {{{ -" Function to display a help window for the current buffer. -function! eclim#help#BufferHelp(lines, orientation, size) - let orig_bufnr = bufnr('%') - let name = expand('%') - if name =~ '^\W.*\W$' - let name = name[:-2] . ' Help' . name[len(name) - 1] - else - let name .= ' Help' - endif - - let bname = eclim#util#EscapeBufferName(name) - - let orient = a:orientation == 'vertical' ? 'v' : '' - if bufwinnr(bname) != -1 - exec 'bd ' . bufnr(bname) - return - endif - - silent! noautocmd exec a:size . orient . "new " . escape(name, ' ') - if a:orientation == 'vertical' - setlocal winfixwidth - else - setlocal winfixheight - endif - setlocal nowrap - setlocal noswapfile nobuflisted nonumber - setlocal nospell norelativenumber - setlocal buftype=nofile bufhidden=delete - nnoremap ? :bd - nnoremap q :bd - - setlocal modifiable noreadonly - silent 1,$delete _ - call append(1, a:lines) - retab - silent 1,1delete _ - - if len(a:000) == 0 || a:000[0] - setlocal nomodified nomodifiable readonly - endif - - let help_bufnr = bufnr('%') - augroup eclim_help_buffer - autocmd! BufWinLeave - autocmd BufWinLeave nested autocmd! eclim_help_buffer * - exec 'autocmd BufWinLeave nested ' . - \ 'autocmd! eclim_help_buffer * ' - exec 'autocmd! BufWinLeave ' - exec 'autocmd BufWinLeave nested bd ' . help_bufnr - augroup END - - return help_bufnr -endfunction " }}} - -" CommandComplete(argLead, cmdLine, cursorPos) {{{ -function! eclim#help#CommandCompleteTag(argLead, cmdLine, cursorPos) - let cmdTail = strpart(a:cmdLine, a:cursorPos) - let argLead = substitute(a:argLead, cmdTail . '$', '', '') - - let savetags = &tags - exec 'set tags=' . escape(escape(g:EclimHelpDir, ' '), ' ') . '/**/tags' - try - let tags = sort(map(taglist(argLead . '.*'), "v:val['name']")) - let results = [] - for tag in tags - if index(results, tag) == -1 - call add(results, tag) - endif - endfor - return results - finally - let &tags = savetags - endtry -endfunction " }}} - -" vim:ft=vim:fdm=marker diff --git a/.vim/bundle/eclim/eclim/autoload/eclim/html/util.vim b/.vim/bundle/eclim/eclim/autoload/eclim/html/util.vim deleted file mode 100644 index 251ab0c..0000000 --- a/.vim/bundle/eclim/eclim/autoload/eclim/html/util.vim +++ /dev/null @@ -1,135 +0,0 @@ -" Author: Eric Van Dewoestine -" -" Description: {{{ -" Various html relatd functions. -" -" License: -" -" Copyright (C) 2005 - 2009 Eric Van Dewoestine -" -" This program is free software: you can redistribute it and/or modify -" it under the terms of the GNU General Public License as published by -" the Free Software Foundation, either version 3 of the License, or -" (at your option) any later version. -" -" This program is distributed in the hope that it will be useful, -" but WITHOUT ANY WARRANTY; without even the implied warranty of -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -" GNU General Public License for more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . -" -" }}} - -" HtmlToText() {{{ -" Converts the supplied basic html to text. -function! eclim#html#util#HtmlToText(html) - let text = a:html - let text = substitute(text, '
\c', '\n', 'g') - let text = substitute(text, '\c', '', 'g') - let text = substitute(text, '\c', '', 'g') - let text = substitute(text, '
  • \c', '- ', 'g') - let text = substitute(text, '
    • \c', '', 'g') - let text = substitute(text, '\c', '', 'g') - let text = substitute(text, '\c', '', 'g') - let text = substitute(text, '\c', '', 'g') - let text = substitute(text, '\c', '', 'g') - let text = substitute(text, '', '', 'g') - let text = substitute(text, '"\c', '"', 'g') - let text = substitute(text, '&\c', '&', 'g') - let text = substitute(text, '<\c', '<', 'g') - let text = substitute(text, '>\c', '>', 'g') - - return text -endfunction " }}} - -" InCssBlock() {{{ -" Determines if the cusor is inside of