add config option for single_undo_time

thomasballinger · thomasballinger · commit 7b19699abc50 · 2015-01-25T16:56:56.000-05:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -53,6 +53,7 @@ def loadini(struct, configfile):
             'hist_length': 100,
             'hist_duplicates': True,
             'paste_time': 0.02,
+            'single_undo_time': 1.0,
             'syntax': True,
             'tab_length': 4,
             'pastebin_confirm': True,
@@ -141,6 +142,7 @@ def get_key_no_doublebind(command):
     struct.syntax = config.getboolean('general', 'syntax')
     struct.arg_spec = config.getboolean('general', 'arg_spec')
     struct.paste_time = config.getfloat('general', 'paste_time')
+    struct.single_undo_time = config.getfloat('general', 'single_undo_time')
     struct.highlight_show_source = config.getboolean('general',
                                                      'highlight_show_source')
     struct.hist_file = config.get('general', 'hist_file')
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -825,8 +825,8 @@ def insert_into_history(self, s):
 
     def prompt_undo(self):
         """Returns how many lines to undo, 0 means don't undo"""
-        self.config.single_undo_time = 1
-        if self.interp.timer.estimate() < self.config.single_undo_time:
+        if (self.config.single_undo_time < 0 or
+            self.interp.timer.estimate() < self.config.single_undo_time):
             return 1
         est = self.interp.timer.estimate()
         n = self.interact.file_prompt(
diff --git a/bpython/sample-config b/bpython/sample-config
@@ -48,6 +48,11 @@
 # bpython’s behalf. If unset, bpython uploads pastes to bpaste.net. (default: )
 #pastebin_helper = gist.py
 
+# How long an undo must be expected to take before prompting for how
+# many lines should be undone. Set to -1 to never prompt, or 0 to
+# always prompt.
+# single_undo_time = 1.0
+
 [keyboard]
 
 # All key bindings are shown commented out with their default binding
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -120,6 +120,15 @@ following helper program can be used to create `gists
 
 .. versionadded:: 0.12
 
+
+single_undo_time
+^^^^^^^^^^^^^^^^
+Time duration an undo must be predicted to take before prompting
+to undo multiple lines at once. Use -1 to never prompt, or 0 to always prompt.
+(default: 1.0)
+
+.. versionadded:: 0.14
+
 .. _configuration_color_scheme:
 
 color_scheme
