# HG changeset patch # User Steve Losh # Date 1579196946 18000 # Node ID 22b96790d57c4d62be4f5bdfdcbe9b6bd5ce515d # Parent 20e6b1f3b43e1492d87703af97237e203ae40d90 Remove unused stuff diff -r 20e6b1f3b43e -r 22b96790d57c fish/config.fish --- a/fish/config.fish Thu Jan 16 12:16:08 2020 -0500 +++ b/fish/config.fish Thu Jan 16 12:49:06 2020 -0500 @@ -55,15 +55,15 @@ # Backwards compatibility? Screw that, it's more important that our function # names have underscores so they look pretty. -function jesus_fucking_christ_bind_the_fucking_keys_fish +function please_fish_just_bind_the_keys bind \cn accept-autosuggestion bind \cw backward-kill-word end function fish_user_keybindings - jesus_fucking_christ_bind_the_fucking_keys_fish + please_fish_just_bind_the_keys end function fish_user_key_bindings - jesus_fucking_christ_bind_the_fucking_keys_fish + please_fish_just_bind_the_keys end # }}} diff -r 20e6b1f3b43e -r 22b96790d57c vim/after/ftplugin/timl.tim --- a/vim/after/ftplugin/timl.tim Thu Jan 16 12:16:08 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -; These are all out here in the middle of goddamned nowhere because the TimL -; ftplugin won't you disable mappings like any other plugin. Also this has to -; be a .tim file because the order of loading goes like this: -; -; ftplugin/*.vim -; after/ftplugin/*.vim -; ftplugin/*.tim -; after/ftplugin/*.tim -; -; Kill me. - -(execute "silent! nunmap cp") -(execute "silent! nunmap cpp") -(execute "silent! nunmap K") - -; Eval fuck only knows what. Toplevel/current form? -(execute "nnoremap e :set opfunc=timl#interactive#eval_opfuncg@") - -; Eval buffer -(execute "nnoremap b :w:source %") - -; Man -(execute "nnoremap M :execute 'help' ftplugin#timl#cursor_keyword()") - -; R[E]PL -(execute "nnoremap E :TLrepl") diff -r 20e6b1f3b43e -r 22b96790d57c vim/bundle/django-custom/ftplugin/django.vim --- a/vim/bundle/django-custom/ftplugin/django.vim Thu Jan 16 12:16:08 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -" The django/python/htmldjango filetype situation is a gigantic clusterfuck. -" -" This file contains stuff for htmldjango files, but is named django.vim because the -" htmldjango.vim file that ships with vim sources html.vim and django.vim. -" -" Of course, using python.django for the Python files ALSO sources django.vim. -" -" Awesome. - -if (&ft == "htmldjango") - if exists("loaded_matchit") - let b:match_ignorecase = 1 - let b:match_skip = 's:Comment' - let b:match_words = '<:>,' . - \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' . - \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' . - \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>,' . - \ '{% *if .*%}:{% *else *%}:{% *endif *%},' . - \ '{% *ifequal .*%}:{% *else *%}:{% *endifequal *%},' . - \ '{% *ifnotequal .*%}:{% *else *%}:{% *endifnotequal *%},' . - \ '{% *ifchanged .*%}:{% *else *%}:{% *endifchanged *%},' . - \ '{% *for .*%}:{% *endfor *%},' . - \ '{% *with .*%}:{% *endwith *%},' . - \ '{% *comment .*%}:{% *endcomment *%},' . - \ '{% *block .*%}:{% *endblock *%},' . - \ '{% *filter .*%}:{% *endfilter *%},' . - \ '{% *spaceless .*%}:{% *endspaceless *%}' - endif -endif diff -r 20e6b1f3b43e -r 22b96790d57c vim/bundle/django-custom/ftplugin/htmldjango/sparkup.py --- a/vim/bundle/django-custom/ftplugin/htmldjango/sparkup.py Thu Jan 16 12:16:08 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../../../sparkup/ftplugin/html/sparkup.py \ No newline at end of file diff -r 20e6b1f3b43e -r 22b96790d57c vim/bundle/django-custom/ftplugin/htmldjango/sparkup.vim --- a/vim/bundle/django-custom/ftplugin/htmldjango/sparkup.vim Thu Jan 16 12:16:08 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../../../sparkup/ftplugin/html/sparkup.vim \ No newline at end of file diff -r 20e6b1f3b43e -r 22b96790d57c vim/bundle/django-custom/indent/htmldjango.vim --- a/vim/bundle/django-custom/indent/htmldjango.vim Thu Jan 16 12:16:08 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -" Vim indent file -" Language: htmldjango -" Maintainer: Steve Losh -" -" Mostly based on indent/eruby.vim -" -" To use: save as ~/.vim/indent/htmldjango.vim - -if exists("b:did_indent") - finish -endif - -runtime! indent/html.vim -unlet! b:did_indent - -if &l:indentexpr == '' - if &l:cindent - let &l:indentexpr = 'cindent(v:lnum)' - else - let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))' - endif -endif -let b:html_indentexpr = &l:indentexpr - -let b:did_indent = 1 - -setlocal indentexpr=GetDjangoIndent() -setlocal indentkeys=o,O,*,{,},o,O,!^F,<>> - -" Only define the function once. -if exists("*GetDjangoIndent") - finish -endif - -function! GetDjangoIndent(...) - if a:0 && a:1 == '.' - let v:lnum = line('.') - elseif a:0 && a:1 =~ '^\d' - let v:lnum = a:1 - endif - let vcol = col('.') - - call cursor(v:lnum,vcol) - - exe "let ind = ".b:html_indentexpr - - let lnum = prevnonblank(v:lnum-1) - let pnb = getline(lnum) - let cur = getline(v:lnum) - - let tagstart = '.*' . '{%\s*' - let tagend = '.*%}' . '.*' - - let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\)' - let midtags = '\(empty\|else\|elif\)' - - let pnb_blockstart = pnb =~# tagstart . blocktags . tagend - let pnb_blockend = pnb =~# tagstart . 'end' . blocktags . tagend - let pnb_blockmid = pnb =~# tagstart . midtags . tagend - - let cur_blockstart = cur =~# tagstart . blocktags . tagend - let cur_blockend = cur =~# tagstart . 'end' . blocktags . tagend - let cur_blockmid = cur =~# tagstart . midtags . tagend - - if pnb_blockstart && !pnb_blockend - let ind = ind + &sw - elseif pnb_blockmid && !pnb_blockend - let ind = ind + &sw - endif - - if cur_blockend && !cur_blockstart - let ind = ind - &sw - elseif cur_blockmid - let ind = ind - &sw - endif - - return ind -endfunction - diff -r 20e6b1f3b43e -r 22b96790d57c vim/bundle/django-custom/syntax/django.vim --- a/vim/bundle/django-custom/syntax/django.vim Thu Jan 16 12:16:08 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -" Vim syntax file -" Language: Django template -" Maintainer: Dave Hodder -" Last Change: 2010 May 19 - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syntax case match - -" Mark illegal characters -syn match djangoError "%}\|}}\|#}" - -" Django template built-in tags and parameters -" 'comment' doesn't appear here because it gets special treatment -syn keyword djangoStatement contained autoescape csrf_token empty -" FIXME ==, !=, <, >, <=, and >= should be djangoStatements: -" syn keyword djangoStatement contained == != < > <= >= -syn keyword djangoStatement contained and as block endblock by cycle debug else -syn keyword djangoStatement contained extends filter endfilter firstof for -syn keyword djangoStatement contained endfor if elif endif ifchanged endifchanged -syn keyword djangoStatement contained ifequal endifequal ifnotequal -syn keyword djangoStatement contained endifnotequal in include load not now or -syn keyword djangoStatement contained parsed regroup reversed spaceless -syn keyword djangoStatement contained endspaceless ssi templatetag openblock -syn keyword djangoStatement contained closeblock openvariable closevariable -syn keyword djangoStatement contained openbrace closebrace opencomment -syn keyword djangoStatement contained closecomment widthratio url with endwith -syn keyword djangoStatement contained get_current_language trans noop blocktrans -syn keyword djangoStatement contained endblocktrans get_available_languages -syn keyword djangoStatement contained get_current_language_bidi plural - -" Django templete built-in filters -syn keyword djangoFilter contained add addslashes capfirst center cut date -syn keyword djangoFilter contained default default_if_none dictsort -syn keyword djangoFilter contained dictsortreversed divisibleby escape escapejs -syn keyword djangoFilter contained filesizeformat first fix_ampersands -syn keyword djangoFilter contained floatformat get_digit join last length length_is -syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust -syn keyword djangoFilter contained lower make_list phone2numeric pluralize -syn keyword djangoFilter contained pprint random removetags rjust slice slugify -syn keyword djangoFilter contained safe safeseq stringformat striptags -syn keyword djangoFilter contained time timesince timeuntil title -syn keyword djangoFilter contained truncatewords truncatewords_html unordered_list upper urlencode -syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno - -" Keywords to highlight within comments -syn keyword djangoTodo contained TODO FIXME XXX - -" Django template constants (always surrounded by double quotes) -syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/ - -" Mark illegal characters within tag and variables blocks -syn match djangoTagError contained "#}\|{{\|[^%]}}\|[&#]" -syn match djangoVarError contained "#}\|{%\|%}\|[<>!&#%]" - -" Django template tag and variable blocks -syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display -syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display - -" Django template 'comment' tag and comment block -syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=djangoTodo -syn region djangoComBlock start="{#" end="#}" contains=djangoTodo - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_django_syn_inits") - if version < 508 - let did_django_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink djangoTagBlock PreProc - HiLink djangoVarBlock PreProc - HiLink djangoStatement Statement - HiLink djangoFilter Identifier - HiLink djangoArgument Constant - HiLink djangoTagError Error - HiLink djangoVarError Error - HiLink djangoError Error - HiLink djangoComment Comment - HiLink djangoComBlock Comment - HiLink djangoTodo Todo - - delcommand HiLink -endif - -let b:current_syntax = "django"