clear up when to REALLY use kill

--HG--
branch : pmacs2
This commit is contained in:
moculus 2008-11-11 05:15:47 +00:00
parent e4f2a4d05b
commit 87c846d3bd
4 changed files with 5 additions and 5 deletions

View File

@ -252,7 +252,7 @@ class DeleteLeft(Method):
line = w.buffer.lines[y] line = w.buffer.lines[y]
tabwidth = w.mode.tabwidth tabwidth = w.mode.tabwidth
if x >= tabwidth and x % tabwidth == 0 and line[0:x].isspace(): if x >= tabwidth and x % tabwidth == 0 and line[0:x].isspace():
w.kill(Point(x - tabwidth, y), Point(x, y)) w.delete(Point(x - tabwidth, y), Point(x, y))
else: else:
w.left_delete() w.left_delete()
class DeleteRight(Method): class DeleteRight(Method):
@ -262,7 +262,7 @@ class DeleteRight(Method):
line = w.buffer.lines[cursor.y] line = w.buffer.lines[cursor.y]
lvl = w.mode.tabwidth lvl = w.mode.tabwidth
if len(line[cursor.x:]) >= lvl and line[:cursor.x + lvl].isspace(): if len(line[cursor.x:]) >= lvl and line[:cursor.x + lvl].isspace():
w.kill(Point(cursor.x, cursor.y), Point(cursor.x + lvl, cursor.y)) w.delete(Point(cursor.x, cursor.y), Point(cursor.x + lvl, cursor.y))
else: else:
w.right_delete() w.right_delete()
class DeleteLeftWord(Method): class DeleteLeftWord(Method):

View File

@ -375,7 +375,7 @@ class PerlHashCleanup(Method):
end_p = Point(0, end + 1) end_p = Point(0, end + 1)
else: else:
end_p = Point(len(w.buffer.lines[end]), end) end_p = Point(len(w.buffer.lines[end]), end)
w.kill(start_p, end_p) w.delete(start_p, end_p)
w.insert_string(start_p, data) w.insert_string(start_p, data)
class PerlWrapParagraph(method.WrapParagraph): class PerlWrapParagraph(method.WrapParagraph):

View File

@ -296,7 +296,7 @@ class PythonDictCleanup(method.Method):
end_p = Point(0, end + 1) end_p = Point(0, end + 1)
else: else:
end_p = Point(len(w.buffer.lines[-1]), len(w.buffer.lines) - 1) end_p = Point(len(w.buffer.lines[-1]), len(w.buffer.lines) - 1)
w.kill(start_p, end_p) w.delete(start_p, end_p)
w.insert_string(start_p, data) w.insert_string(start_p, data)
class PythonInsertTripleSquotes(method.Method): class PythonInsertTripleSquotes(method.Method):

View File

@ -67,7 +67,7 @@ class SearchDeleteLeft(method.Method):
_post_delete(w) _post_delete(w)
class SearchDeleteLeftWord(method.Method): class SearchDeleteLeftWord(method.Method):
def execute(self, w, **vargs): def execute(self, w, **vargs):
w.kill_left_word() w.delete_left_word()
_post_delete(w) _post_delete(w)
def _post_delete(w): def _post_delete(w):
old_cursor = w.buffer.method.old_cursor old_cursor = w.buffer.method.old_cursor