Squashed commit of the following:

commit 33358874f1c275d8b08186e29f24a7889d2b5224
Author: maxfl <gmaxfl@gmail.com>
Date:   Thu Jun 14 11:01:13 2012 +0400

    revert fish_pager

commit cee1bc8a66ec3adc9573b76e1aca3131cd32db83
Author: maxfl <gmaxfl@gmail.com>
Date:   Thu Jun 14 10:57:41 2012 +0400

    revert fish_pager.cpp

commit 27f3bd39dd9903009503d20a59a9e2ba84add07a
Author: maxfl <gmaxfl@gmail.com>
Date:   Wed Jun 13 17:35:20 2012 +0400

    __fish_complete_command now can understand '--arg=option' tokens
    latexmk completion is updated

commit 97b53a4b53de9389675783f3e90f58215d936356
Author: maxfl <gmaxfl@gmail.com>
Date:   Wed Jun 13 16:46:47 2012 +0400

    . completion

commit d5b63b9963b0a02a71f564e7392171c5eab005cd
Author: maxfl <gmaxfl@gmail.com>
Date:   Wed Jun 13 16:46:13 2012 +0400

    a lot of new completions

commit ceab87d99425124aa010c64ed062e27202b850d2
Author: Maxim Gonchar <gonchar@myhost.localdomain>
Date:   Tue Jun 12 20:19:31 2012 +0400

    A lot of new completions.
    Some small updates and fixes of old functions and completions.

commit 950aecd570b51e1b9dc444cc651b282a220e8d94
Author: Maxim Gonchar <gonchar@myhost.localdomain>
Date:   Tue Jun 12 20:03:44 2012 +0400

    step-coloring initial
    set_color correction

1 files changed, 1 insertions, 25 deletions

diff --git a/share/completions/diff.fish b/share/completions/diff.fish
index 88813b7b..c2d35c72 100644
--- a/share/completions/diff.fish
+++ b/share/completions/diff.fish
@@ -1,26 +1,2 @@
 # Completions for diff
-complete -c diff -s i -l ignore-case --description "Ignore case differences"
-complete -c diff -l ignore-file-name-case --description "Ignore case when comparing file names"
-complete -c diff -l no-ignore-file-name-case --description "Consider case when comparing file names"
-complete -c diff -s E -l ignore-tab-expansion --description "Ignore changes due to tab expansion"
-complete -c diff -s b -l ignore-space-change --description "Ignore changes in the amount of white space"
-complete -c diff -s w -l ignore-all-space --description "Ignore all white space"
-complete -c diff -s B -l ignore-blank-lines --description "Ignore changes whose lines are all blank"
-complete -c diff -s I -l ignore-matching-lines -x --description "Ignore changes whose lines match the REGEX"
-complete -c diff -s a -l text --description "Treat all files as text"
-complete -c diff -s r -l recursive --description "Recursively compare subdirectories"
-complete -c diff -s N -l new-file --description "Treat absent files as empty"
-complete -c diff -s C -l context -x --description "Output NUM lines of copied context"
-complete -c diff -s c --description "Output 3 lines of copied context"
-complete -c diff -s U -l unified -x --description "Output NUM lines of unified context"
-complete -c diff -s u --description "Output 3 lines of unified context"
-complete -c diff -s q -l brief --description "Output only whether the files differ"
-complete -c diff -l normal --description "Output a normal diff"
-complete -c diff -s y -l side-by-side --description "Output in two columns"
-complete -c diff -s W -l width -x --description "Output at most NUM print columns"
-complete -c diff -s d -l minimal --description "Try to find a smaller set of changes"
-complete -c diff -l from-file -r --description "Compare FILE1 to all operands"
-complete -c diff -l to-file -r --description "Compare FILE2 to all operands"
-complete -c diff -s l -l paginate --description "Pass the output through 'pr'"
-complete -c diff -s v -l version --description "Display version and exit"
-complete -c diff -l help --description "Display help and exit"
+__fish_complete_diff diff