Merge.

Trundle · Trundle · commit d05044fa76b0 · 2012-09-30T00:24:38.000+02:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -4,7 +4,7 @@
 from ConfigParser import ConfigParser
 from itertools import chain
 from bpython.keys import cli_key_dispatch as key_dispatch
-from bpython.autocomplete import SUBSTRING
+from bpython.autocomplete import SIMPLE as default_completion
 
 MAGIC_METHODS = ", ".join("__%s__" % s for s in [
     "init", "repr", "str", "lt", "le", "eq", "ne", "gt", "ge", "cmp", "hash",
@@ -56,7 +56,7 @@ def loadini(struct, configfile):
             'color_scheme': 'default',
             'complete_magic_methods' : True,
             'magic_methods' : MAGIC_METHODS,
-            'autocomplete_mode': SUBSTRING,
+            'autocomplete_mode': default_completion,
             'dedent_after': 1,
             'flush_output': True,
             'highlight_show_source': True,
diff --git a/doc/sphinx/source/configuration.rst b/doc/sphinx/source/configuration.rst
@@ -25,7 +25,9 @@ autocomplete_mode
 There are three modes for autocomplete. simple, substring, and fuzzy.
 Simple matches methods with a common prefix, substring matches methods with a common
 subsequence, and fuzzy matches methods with common characters (default:
-substring).
+simple).
+
+.. versionadded:: 0.12
 
 syntax
 ^^^^^^
