From 1c20afcd3c1c12985ae926ce1b1c3574d2f88b31 Mon Sep 17 00:00:00 2001 From: Stefan Liebl Date: Wed, 4 Mar 2015 11:51:25 +0100 Subject: [PATCH] vimsuite Doku verbessert Change-Id: I8eb427bb7c9d255e4baa457d0de435bfefdb0bf7 --- vimfiles.stefan/doc/tags | 2 +- vimfiles.stefan/doc/vimsuite.txt | 59 ++++++-------------------------- 2 files changed, 11 insertions(+), 50 deletions(-) diff --git a/vimfiles.stefan/doc/tags b/vimfiles.stefan/doc/tags index a0b94ef..244cce9 100644 --- a/vimfiles.stefan/doc/tags +++ b/vimfiles.stefan/doc/tags @@ -59,7 +59,6 @@ CommentInOut vimsuite.txt /*CommentInOut* DelAllMultipleEmptyLines vimsuite.txt /*DelAllMultipleEmptyLines* DelAllMultipleSameLines vimsuite.txt /*DelAllMultipleSameLines* DelAllTrailingWhitespace vimsuite.txt /*DelAllTrailingWhitespace* -DirDiff vimsuite.txt /*DirDiff* GVimMerge vimsuite.txt /*GVimMerge* GrepDir vimsuite.txt /*GrepDir* GrepFiles vimsuite.txt /*GrepFiles* @@ -87,6 +86,7 @@ bmskWA bmsk.txt /*bmskWA* ccm ccm.txt /*ccm* ccm.txt ccm.txt /*ccm.txt* cscope_macros vimsuite.txt /*cscope_macros* +diffchar vimsuite.txt /*diffchar* g:GrepDir vimsuite.txt /*g:GrepDir* g:GrepFiles vimsuite.txt /*g:GrepFiles* g:WA vimsuite.txt /*g:WA* diff --git a/vimfiles.stefan/doc/vimsuite.txt b/vimfiles.stefan/doc/vimsuite.txt index af23025..ee396a6 100644 --- a/vimfiles.stefan/doc/vimsuite.txt +++ b/vimfiles.stefan/doc/vimsuite.txt @@ -14,15 +14,17 @@ Die VimSuite besteht aus vimscripts von http://www.vim.org und eigenen Scripten von Stefan Liebl. Folgende wichtige Scripts sind enthalten: |VimSuiteTools|Tools zum Programmieren von Stefan Liebl +|BMSK| Makros zum Arbeiten mit BMS-K/BMS-KP Quellcode |LaTeX| Suite Tools zum bearbeiten von LaTeX Quelltexten |crefvim| Referenz zur Programmiersprache C (Anleitung in|crefvimdoc|) |visincr| Inkrementieren von Nummern in Spalten |cscope_macros|Anwenden der Datenbank für Label in C -|DirDiff| Vergleichen von kompletten Verzeichnissen +|dirdiff| Vergleichen von kompletten Verzeichnissen |tComment.txt| Erzeugen von Kommentaren in vielen Sprachen -|SVNstudio| Arbeiten mit Subversion -|CCM| Arbeiten mit CM/Synergy -|BMSK| Makros zum Arbeiten mit BMS-K/BMS-KP Quellcode +|fugitive| Arbeiten mit Git +|gitv| Git browser wie Gitk oder TortoiseGit +|diffchar| Exakte diffs pro Zeile darstellen +|linediff| Differenz zweier beliebiger Textblöcke ============================================================================== *vimsuite.2* Installation *VimSuiteInstallation* @@ -201,51 +203,10 @@ Folgende Mappings sind definiert: d called: find functions that function under cursor calls ============================================================================== - *DirDiff* + *diffchar* -Doing the following will generate a diff window. - - :DirDiff -e.g. - :DirDiff ../something/dir1 /usr/bin/somethingelse/dir2 - -The following commands can be used inside the diff window: -'Enter','o' - Diff open: open the diff file(s) where your cursor is at -'s' - Synchronize the current diff. You can also select - a range (through visual) and press 's' to synchronize differences - across a range. - - - There are 6 Options you can choose when you hit 's': - 1. A -> B - Copy A to overwrite B - If A's file actually points to a directory, it'll copy it to B - recursively. - 2. B -> A - Copy B to overwrite A - If B's file actually points to a directory, it'll copy it to A - recursively. - 3. Always A - For the rest of the items that you've selected, - synchronize like (1). - 4. Always B - For the rest of the items that you've selected, - synchronize like (2). - 5. Skip - Skip this diff entry. - 6. Cancel - Quit the loop and exit. - -'u' - Diff update: update the diff window -'x' - Sets the exclude pattern, separated by ',' -'i' - Sets the ignore pattern, separated by ',' -'a' - Sets additional arguments for diff, eg. -w to ignore white space, - etc. -'q' - Quit DirDiff - -The following comamnds can be used in the Vim diff mode -\dg - Diff get: maps to :diffget -\dp - Diff put: maps to :diffput -\dj - Diff next: (think j for down) -\dk - Diff previous: (think k for up) +Highlight the exact differences, based on characters and words + :[range]SDChar - Highlight difference units for [range] + :[range]RDChar - Reset the highlight of difference units for [range]