Changeset 2924

Timestamp:

01/07/08 12:46:56 (1 year ago)

Author:

jstenar

Message:

pyreadline: Added code to make interoperability with emacs work again.

Files:

• pyreadline/trunk/doc/ChangeLog (modified) (1 diff)
• pyreadline/trunk/pyreadline/console/console.py (modified) (4 diffs)

pyreadline/trunk/doc/ChangeLog

@@ +1 @@
+2008-01-07 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+    * Reintroduced code to make pyreadline work with emacs. Not tested.
+      Requested by Frank Wang.
+
-2008-01-04 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
-    * Chunking calls to WriteConsoleW to ensure not exceeding 64k limit

pyreadline/trunk/pyreadline/console/console.py

@@ -14 +14 @@
-# primitive debug printing that won't interfere with the screen
-
-
+,os
-import traceback
-import re
@@ -146 +146 @@
-    'WriteConsoleW',
-    'WriteConsoleOutputCharacterW',
+    'WriteFile',
-    ]
-
@@ -346 +347 @@
-        return n
-
-
-    def write_plain(self, text, attr=None):
-        '''write text at current cursor position.'''
@@ -357 +357 @@
-            self.WriteConsoleW(self.hout, ensure_unicode(short_chunk), len(short_chunk), byref(junk), None)
-        return len(text)
+
+    #This function must be used to ensure functioning with EMACS
+    #Emacs sets the EMACS environment variable
+    if os.environ.has_key("EMACS"):
+        def write_color(self, text, attr=None):
+            junk = c_int(0)
+            self.WriteFile(self.hout, text, len(text), byref(junk),None)
+            return len(text)
+        write_plain = write_color
-
-    # make this class look like a file object