Changeset 2931

Timestamp:

01/11/08 11:53:58 (11 months ago)

Author:

vivainio

Message:

readline.get_endidx is configurable, for emacs users

Files:

• ipython/trunk/IPython/completer.py (modified) (5 diffs)
• ipython/trunk/doc/ChangeLog (modified) (1 diff)
• ipython/trunk/test/test_completer.py (added)

ipython/trunk/IPython/completer.py

@@ -248 +248 @@
-        self.readline.set_completer_delims(delims)
-        self.get_line_buffer = self.readline.get_line_buffer
+        self.get_endidx = self.readline.get_endidx
-        self.omit__names = omit__names
-        self.merge_completions = shell.rc.readline_merge_completions        
@@ -273 +274 @@
-                         self.python_func_kw_matches]
-
+    
-    # Code contributed by Alex Schmolck, for ipython/emacs integration
-    def all_completions(self, text):
@@ -561 +563 @@
-            
-        return None
-
-
+
-    def complete(self, text, state,line_buffer=None):
-        """Return the next possible completion for 'text'.
@@ -585 +586 @@
-        # an editor (as long as autoindent is off).
-
+        # It should be noted that at least pyreadline still shows
+        # file completions - is there a way around it?
+        
-        # don't apply this on 'dumb' terminals, such as emacs buffers, so we
-        # don't interfere with their own tab-completion mechanism.
@@ -599 +603 @@
-        magic_prefix = self.magic_prefix
-
-readline.
+
-
-        try:

ipython/trunk/doc/ChangeLog

@@ -7 +7 @@
-    * ipy_user_conf.py: Added an example on how to change term 
-    colors in config file (through using autoexec).
+
+    * completer.py, test_completer.py: Ability to specify custom
+    get_endidx to replace readline.get_endidx. For emacs users.
-    
-2008-01-10 Ville Vainio  <vivainio@gmail.com>