branch : pmacs2
This commit is contained in:
moculus 2008-05-29 20:35:21 +00:00
parent 4614d4ee20
commit 6e4d5117ae
2 changed files with 7 additions and 0 deletions

View File

@ -581,6 +581,10 @@ class Application(object):
self.draw() self.draw()
while not self.done: while not self.done:
i = self.win.getch() i = self.win.getch()
#if not self.mini_active and self.completion_window_is_open():
# self.close_completion_buffer()
if i == curses.KEY_RESIZE: if i == curses.KEY_RESIZE:
while i == curses.KEY_RESIZE: while i == curses.KEY_RESIZE:
i = self.win.getch() i = self.win.getch()
@ -593,6 +597,7 @@ class Application(object):
while len(self.input.tokens): while len(self.input.tokens):
t = self.input.tokens.pop(0) t = self.input.tokens.pop(0)
self.active_window().mode.handle_token(t) self.active_window().mode.handle_token(t)
self.draw(err) self.draw(err)
# clear the error line; it might look confusing to the user # clear the error line; it might look confusing to the user

View File

@ -2,6 +2,7 @@ import os, commands, re, sets, tempfile
from subprocess import Popen, PIPE, STDOUT from subprocess import Popen, PIPE, STDOUT
import buffer, default, dirutil, regex, util, window import buffer, default, dirutil, regex, util, window
import mode.mini
from point import Point from point import Point
from method import DATATYPES, Method, Argument from method import DATATYPES, Method, Argument
@ -130,6 +131,7 @@ class TokenComplete(Method):
w.buffer.delete(p1, p2) w.buffer.delete(p1, p2)
w.insert_string(p1, result) w.insert_string(p1, result)
#mode.mini.use_completion_window(w.application, result, candidates)
if not candidates: if not candidates:
w.set_error("No completion: %r" % result) w.set_error("No completion: %r" % result)
elif len(candidates) == 1: elif len(candidates) == 1: