From 71c3e8c3d85b1d11e59e7896b303ba3f591e20ac Mon Sep 17 00:00:00 2001 From: andre Date: Fri, 2 Mar 2012 11:42:44 +0000 Subject: [PATCH] Added custom help for mappings --- vim/doc/akmap.txt | 63 +++++++++++++++++++++++++++++++++++++++ vim/doc/tags | 34 +++++---------------- vim/plugin/jsbeautify.vim | 2 +- vim/vimrc | 2 +- 4 files changed, 72 insertions(+), 29 deletions(-) create mode 100644 vim/doc/akmap.txt diff --git a/vim/doc/akmap.txt b/vim/doc/akmap.txt new file mode 100644 index 0000000..d8b939d --- /dev/null +++ b/vim/doc/akmap.txt @@ -0,0 +1,63 @@ +*akmap.txt* Andre Vim mappings $Id$ + +Author: Andrea Mistrali +Last change: $Date$ + + +1. Overview |akmap-intro| +2. Toggles |akmap-toggles| +3. OS Interaction |akmap-os| +4. Developer |akmap-dev| +5. Commenter |akmap-commenter| +6. Text |akmap-text| +7. Misc |akmap-misc| + +============================================================================= + *akmap-intro* +1. Overview~ +,hh - Show this file + + *akmap-toggles* +2. Toggles~ +,l - Toggle list |list| +,N - Toggle line numbers |numbers| +,x - Toggle paste |paste| +,f - Toggle Full screen +,n - Toggle NERD Tree (file browser) |NERDTree| +,T - Toggle tags list |taglist.txt| + + *akmap-os* +3. OS interaction~ +,ts - Open terminal window, splitting |ConqueTerm| +,tt - Open terminal window, new tab |ConqueTerm| + - Open Filemanager (Finder) in actual directory + + *akmap-dev* +4. Developer~ +,ml - Append modeline +,ff - Javascript beautifier +,pw - PyDoc + + *akmap-commenter* +5. Commenter~ +See |NERDCommenter| + +,cc - Comment +,cu - Uncomment +,ci - Invert comment status (decomment if commented, comment else) +,cy - Yank and comment +,ca - Alternate delimiters +,cs - Sexy comments (nicer) + + *akmap-text* +6. Text~ +See |textformat| + +,ac - Align center +,aj - Align justify +,al - Align left +,ar - Align right + + *akmap-misc* +7. Misc~ +Empty for now diff --git a/vim/doc/tags b/vim/doc/tags index 8cd9799..7188cca 100644 --- a/vim/doc/tags +++ b/vim/doc/tags @@ -75,7 +75,6 @@ :NERDTreeFromBookmark NERD_tree.txt /*:NERDTreeFromBookmark* :NERDTreeMirror NERD_tree.txt /*:NERDTreeMirror* :NERDTreeToggle NERD_tree.txt /*:NERDTreeToggle* -:Snippet snippets_emu.txt /*:Snippet* :TChangesetOpen trac.txt /*:TChangesetOpen* :TTAddComment trac.txt /*:TTAddComment* :TTClearAllFilters trac.txt /*:TTClearAllFilters* @@ -165,8 +164,6 @@ ConqueTerm_SendVisKey conque_term.txt /*ConqueTerm_SendVisKey* ConqueTerm_Syntax conque_term.txt /*ConqueTerm_Syntax* ConqueTerm_TERM conque_term.txt /*ConqueTerm_TERM* ConqueTerm_ToggleKey conque_term.txt /*ConqueTerm_ToggleKey* -CreateBundleSnippet snippets_emu.txt /*CreateBundleSnippet* -CreateSnippet snippets_emu.txt /*CreateSnippet* NERDComAbout NERD_commenter.txt /*NERDComAbout* NERDComAlignedComment NERD_commenter.txt /*NERDComAlignedComment* NERDComAltDelim NERD_commenter.txt /*NERDComAltDelim* @@ -285,6 +282,13 @@ VCSCommandSVNDiffOpt vcscommand.txt /*VCSCommandSVNDiffOpt* VCSCommandSVNExec vcscommand.txt /*VCSCommandSVNExec* VCSCommandSplit vcscommand.txt /*VCSCommandSplit* VCSCommandVCSTypeOverride vcscommand.txt /*VCSCommandVCSTypeOverride* +akmap-commenter akmap.txt /*akmap-commenter* +akmap-dev akmap.txt /*akmap-dev* +akmap-intro akmap.txt /*akmap-intro* +akmap-os akmap.txt /*akmap-os* +akmap-text akmap.txt /*akmap-text* +akmap-toggles akmap.txt /*akmap-toggles* +akmap.txt akmap.txt /*akmap.txt* align Align.txt /*align* align-align Align.txt /*align-align* align-codepoint Align.txt /*align-codepoint* @@ -373,7 +377,6 @@ b:VCSCommandCommand vcscommand.txt /*b:VCSCommandCommand* b:VCSCommandOriginalBuffer vcscommand.txt /*b:VCSCommandOriginalBuffer* b:VCSCommandSourceFile vcscommand.txt /*b:VCSCommandSourceFile* b:VCSCommandVCSType vcscommand.txt /*b:VCSCommandVCSType* -basic-snippet snippets_emu.txt /*basic-snippet* bufexplorer bufexplorer.txt /*bufexplorer* bufexplorer-changelog bufexplorer.txt /*bufexplorer-changelog* bufexplorer-credits bufexplorer.txt /*bufexplorer-credits* @@ -406,7 +409,6 @@ conque-term-usage conque_term.txt /*conque-term-usage* conque-term-windows conque_term.txt /*conque-term-windows* conque-term-write conque_term.txt /*conque-term-write* conque-term-writeln conque_term.txt /*conque-term-writeln* -creating-snippets snippets_emu.txt /*creating-snippets* cvscommand-changes vcscommand.txt /*cvscommand-changes* g:bufExplorerDefaultHelp bufexplorer.txt /*g:bufExplorerDefaultHelp* g:bufExplorerDetailedHelp bufexplorer.txt /*g:bufExplorerDetailedHelp* @@ -419,7 +421,6 @@ g:bufExplorerSortBy bufexplorer.txt /*g:bufExplorerSortBy* g:bufExplorerSplitBelow bufexplorer.txt /*g:bufExplorerSplitBelow* g:bufExplorerSplitOutPathName bufexplorer.txt /*g:bufExplorerSplitOutPathName* g:bufExplorerSplitRight bufexplorer.txt /*g:bufExplorerSplitRight* -named-tags snippets_emu.txt /*named-tags* open-terminal open_terminal.txt /*open-terminal* open-terminal-about open_terminal.txt /*open-terminal-about* open-terminal-changelog open_terminal.txt /*open-terminal-changelog* @@ -427,27 +428,6 @@ open-terminal-commands open_terminal.txt /*open-terminal-commands* open-terminal-introduction open_terminal.txt /*open-terminal-introduction* open-terminal-keymap open_terminal.txt /*open-terminal-keymap* open-terminal-requires open_terminal.txt /*open-terminal-requires* -snip-advanced-tag-commands snippets_emu.txt /*snip-advanced-tag-commands* -snip-buffer-specific snippets_emu.txt /*snip-buffer-specific* -snip-bundles snippets_emu.txt /*snip-bundles* -snip-contact-details snippets_emu.txt /*snip-contact-details* -snip-contributors snippets_emu.txt /*snip-contributors* -snip-detailed-explanations snippets_emu.txt /*snip-detailed-explanations* -snip-elem-delimiter snippets_emu.txt /*snip-elem-delimiter* -snip-ftplugin snippets_emu.txt /*snip-ftplugin* -snip-limitations snippets_emu.txt /*snip-limitations* -snip-menu snippets_emu.txt /*snip-menu* -snip-remap-key snippets_emu.txt /*snip-remap-key* -snip-snippet-commands snippets_emu.txt /*snip-snippet-commands* -snip-special-vars snippets_emu.txt /*snip-special-vars* -snip-start-end-tags snippets_emu.txt /*snip-start-end-tags* -snip-tag-name-syntax snippets_emu.txt /*snip-tag-name-syntax* -snippet-commands snippets_emu.txt /*snippet-commands* -snippets_emu-bugs snippets_emu.txt /*snippets_emu-bugs* -snippets_emu-features snippets_emu.txt /*snippets_emu-features* -snippets_emu-options snippets_emu.txt /*snippets_emu-options* -snippets_emu-troubleshooting snippets_emu.txt /*snippets_emu-troubleshooting* -snippets_emu.txt snippets_emu.txt /*snippets_emu.txt* taglist-commands taglist.txt /*taglist-commands* taglist-debug taglist.txt /*taglist-debug* taglist-extend taglist.txt /*taglist-extend* diff --git a/vim/plugin/jsbeautify.vim b/vim/plugin/jsbeautify.vim index 913d792..b75bbf1 100644 --- a/vim/plugin/jsbeautify.vim +++ b/vim/plugin/jsbeautify.vim @@ -292,7 +292,7 @@ function! g:Jsbeautify() "let a:options = {} let s:opt_indent_size = 1 - let s:opt_indent_char = "\t" + let s:opt_indent_char = " " let s:opt_preserve_newlines = 1 let s:opt_indent_level = 0 diff --git a/vim/vimrc b/vim/vimrc index d2e0e41..1db2f2d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -216,7 +216,7 @@ if has("autocmd") autocmd BufNewFile,BufRead *.txt setf txt autocmd FileType txt set textwidth=78 printfont=:h10 " Javascript - autocmd FileType javascript set sw=4 ts=4 sts=4 + autocmd FileType javascript set sw=4 ts=4 sts=4 smarttab expandtab autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS