Merge branch 'release/1.1.1'

* release/1.1.1:
  Bump version
  Update docs
  Replace hard tabs with spaces to avoid jumping
  Update doc reference
  Update comments and code folds
  Make InitOptions take a dict as its parameter
  Fix "e" operator-pending motion
  Add credits
  Update docs
  Allow customizing all key mappings

Author: Lokaltog

doc/easymotion.txt

@@ -1,4 +1,4 @@
-*easymotion.txt*	Version 1.1.0.1.  Last change: 2011 Mar 31
+*easymotion.txt*	Version 1.1.1.  Last change: 2011 Apr 1
 
 
             ______                  __  ___       __  _
@@ -23,6 +23,7 @@ CONTENTS                                                 *easymotion-contents*
        4.3 EasyMotion_shade_hl ............ |EasyMotion_shade_hl|
        4.4 EasyMotion_do_shade ............ |EasyMotion_do_shade|
        4.5 EasyMotion_do_mapping .......... |EasyMotion_do_mapping|
+       4.6 Custom mappings ................ |easymotion-custom-mappings|
     5. License ............................ |easymotion-license|
     6. Known bugs ......................... |easymotion-known-bugs|
     7. Contributing ....................... |easymotion-contributing|
@@ -42,7 +43,7 @@ following the cursor is faded, and motion targets are highlighted.
 2. Usage                                                    *easymotion-usage*
 
 EasyMotion is triggered by one of the provided mappings (see
-|EasyMotion_do_mapping| for details).
+|easymotion-default-mappings| for details).
 
 Example: >
 
@@ -89,6 +90,7 @@ visual and operator-pending mode:
     <Leader>k         | Line upward. See |k|.
 
 See |mapleader| for details about the leader key.
+See |easymotion-custom-mappings| for customizing default mappings.
 
 ==============================================================================
 3. Requirements                                      *easymotion-requirements*
@@ -159,10 +161,27 @@ Set this option to 0 if you want to disable the default mappings. See
 |easymotion-default-mappings| for details about the default mappings.
 
 Note: If you disable this option, you'll have to map the motions yourself. See
-the plugin source code for mapping details.
+the plugin source code for mapping details. You usually shouldn't need to do
+this, see |easymotion-custom-mappings| for customizing the default mappings.
 
 Default: 1
 
+------------------------------------------------------------------------------
+4.6 Custom mappings                               *easymotion-custom-mappings*
+
+EasyMotion allows you to customize all default mappings to avoid conflicts
+with existing mappings. All custom mappings follow the same variable format: >
+
+    EasyMotion_mapping_{motion} = {mapping}
+
+Example: >
+
+    let g:EasyMotion_mapping_f = '_f'
+    let g:EasyMotion_mapping_T = '<C-T>'
+
+See |easymotion-default-mappings| for a table of motions that can be mapped
+and their default values.
+
 ==============================================================================
 5. License                                                *easymotion-license*
 
@@ -173,8 +192,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
 ==============================================================================
 6. Known bugs                                          *easymotion-known-bugs*
 
-- Lines jump to the left when usin j/k motions when a line is prepended
-  by a hard tab due to the tab being replaced with the marker character.
+None.
 
 ==============================================================================
 7. Contributing                                      *easymotion-contributing*
@@ -191,6 +209,7 @@ Source repository: https://github.com/Lokaltog/vim-easymotion
 
 - Ben Boeckel: ge motion
 - Drew Neil: operator-pending mappings
+- Rob O'Dwyer: customizable mappings without giving up all defaults
 
 EasyMotion is based on Bartlomiej Podolak's great PreciseJump script, which
 can be downloaded here: