From a37bedc6341bdaf2445d42b631a556357361ab39 Mon Sep 17 00:00:00 2001 From: Jorgen Stenarson Date: Mon, 19 Jul 2010 19:09:00 +0200 Subject: [PATCH 1/3] Fix to #607329. Error in setup.py when sphinx is not installed. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 151c3be..79a698b 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ try: from sphinx.setup_command import BuildDoc cmd_class ={'build_sphinx': BuildDoc} except ImportError: - cmd_class = None + cmd_class = {} packages = ['pyreadline','pyreadline.clipboard','pyreadline.configuration', 'pyreadline.console','pyreadline.keysyms','pyreadline.lineeditor', From 10b63b23219d2ef20ae1f569272cd231ce1adfa0 Mon Sep 17 00:00:00 2001 From: Jorgen Stenarson Date: Mon, 19 Jul 2010 19:09:58 +0200 Subject: [PATCH 2/3] Bumping version to 1.6.1 --- pyreadline/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyreadline/release.py b/pyreadline/release.py index 32d6531..28f7d24 100644 --- a/pyreadline/release.py +++ b/pyreadline/release.py @@ -22,7 +22,7 @@ name = u'pyreadline' branch = u'' -version = u'1.6' +version = u'1.6.1' revision = u'$Revision$' From b656ba1f3a09f779fedc68c02dd5337b46a034f1 Mon Sep 17 00:00:00 2001 From: Jorgen Stenarson Date: Mon, 19 Jul 2010 19:14:38 +0200 Subject: [PATCH 3/3] Add default for ctrl-h same as backspace --- pyreadline/modes/emacs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyreadline/modes/emacs.py b/pyreadline/modes/emacs.py index dcf35ba..d76680f 100644 --- a/pyreadline/modes/emacs.py +++ b/pyreadline/modes/emacs.py @@ -600,6 +600,7 @@ class EmacsMode(DigitArgumentMode, IncrementalSearchPromptMode, SearchPromptMode self._bind_key(u'Control-b', self.backward_char) self._bind_key(u'Right', self.forward_char) self._bind_key(u'Control-f', self.forward_char) + self._bind_key(u'Control-h', self.backward_delete_char) self._bind_key(u'BackSpace', self.backward_delete_char) self._bind_key(u'Control-BackSpace', self.backward_delete_word)