From e66d1592ba171e7eecc60f7400a1b681f4e5d931 Mon Sep 17 00:00:00 2001
From: moculus <none@none>
Date: Sat, 8 Nov 2008 15:40:21 +0000
Subject: [PATCH] more consistent kill stuff

--HG--
branch : pmacs2
---
 method/__init__.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/method/__init__.py b/method/__init__.py
index 85b46ab..a11de8e 100644
--- a/method/__init__.py
+++ b/method/__init__.py
@@ -279,11 +279,11 @@ class DeleteRight(Method):
 class DeleteLeftWord(Method):
     '''Delete the from the cursor left to the end of the word'''
     def _execute(self, w, **vargs):
-        w.kill_left_word()
+        w.delete_left_word()
 class DeleteRightWord(Method):
     '''Delete the from under cursor right to the end of the word'''
     def _execute(self, w, **vargs):
-        w.kill_right_word()
+        w.delete_right_word()
 class DeleteLeftWhitespace(Method):
     '''Delete all contiguous of whitespace left of the cursor'''
     def _execute(self, w, **vargs):
@@ -296,7 +296,7 @@ class DeleteLeftWhitespace(Method):
             p = l
             l = w.point_left(p)
         if p < c:
-            w.kill(p, c)
+            w.delete(p, c)
 class DeleteRightWhitespace(Method):
     '''Delete all contiguous of whitespace under and right of the cursor'''
     def _execute(self, w, **vargs):
@@ -308,7 +308,7 @@ class DeleteRightWhitespace(Method):
                 break
             p = r
         if p > c:
-            w.kill(c, p)
+            w.delete(c, p)
 class DeleteLeftSpace(Method):
     '''Delete all contiguous spaces left of the cursor'''
     def _execute(self, w, **vargs):
@@ -321,7 +321,7 @@ class DeleteLeftSpace(Method):
             p = l
             l = w.point_left(p)
         if p < c:
-            w.kill(p, c)
+            w.delete(p, c)
 class DeleteRightSpace(Method):
     '''Delete all contiguous spaces under and right of the cursor'''
     def _execute(self, w, **vargs):
@@ -333,7 +333,7 @@ class DeleteRightSpace(Method):
                 break
             p = r
         if p > c:
-            w.kill(c, p)
+            w.delete(c, p)
 
 class MetaX(Method):
     '''Invoke commands by name'''
@@ -463,7 +463,7 @@ class KillWhitespace(Method):
         cursor = w.logical_cursor()
         i = w.buffer.count_leading_whitespace(cursor.y)
         if i > 0:
-            w.kill(Point(0, cursor.y), Point(i, cursor.y))
+            w.delete(Point(0, cursor.y), Point(i, cursor.y))
 
 # tabification
 class TabBuffer(Method):
@@ -667,7 +667,7 @@ class WrapParagraph(Method):
             k += 1
 
         # kill the old paragraph region, insert the new, and goto the new cursor
-        w.kill(p1, Point(len(w.buffer.lines[i-1]), i-1))
+        w.delete(p1, Point(len(w.buffer.lines[i-1]), i-1))
         w.insert_lines(p1, newlines)
         w.goto(Point(x, y))