From 6fe75a3f8fa0939bf2bcbea08b10c5f7d8cb7cc6 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Mon, 5 Apr 2010 15:57:13 -0400
Subject: Removed kill-ring.

---
 core/ext/key_commands.lua | 21 ++++++++-------------
 core/ext/menu.lua         | 19 -------------------
 core/locale.conf          | 24 ------------------------
 3 files changed, 8 insertions(+), 56 deletions(-)

(limited to 'core')

diff --git a/core/ext/key_commands.lua b/core/ext/key_commands.lua
index 162f97a9..05543b4d 100644
--- a/core/ext/key_commands.lua
+++ b/core/ext/key_commands.lua
@@ -166,9 +166,6 @@ if not MAC then
   -- TODO: { m_editing.convert_indentation }
   -- TODO: { m_editing.smart_cutcopy }
   -- TODO: { m_editing.smart_cutcopy, 'copy' }
-  -- TODO: { m_editing.smart_paste }
-  -- TODO: { m_editing.smart_paste, 'cycle' }
-  -- TODO: { m_editing.smart_paste, 'reverse' }
   keys.ac = { -- enClose in...
     t     = { m_editing.enclose, 'tag'        },
     T     = { m_editing.enclose, 'single_tag' },
@@ -282,9 +279,9 @@ else
 
   --[[
     C:                     J     M               U   W X   Z
-    A:         D E     H   J K L                 U
+    A:         D E     H   J K L                 U       Y
     CS:      C D     G H I J K L M   O   Q   S T U V W X Y Z
-    SA:  A B C D       H I J K L M N O   Q R   T U V   X
+    SA:  A B C D       H I J K L M N O   Q R   T U V   X Y
     CA:  A   C   E         J K L M N O   Q R S T U V W X Y Z
     CSA: A   C D E     H   J K L M N O P Q R S T U V W X Y Z
   ]]--
@@ -308,11 +305,11 @@ else
 
   -- Edit
   local m_editing = _m.textadept.editing
-  keys.az  = { 'undo', b                       }
-  keys.aZ  = { 'redo', b                       }
-  keys.ax  = { 'cut', b                        }
-  keys.ac  = { m_editing.smart_cutcopy, 'copy' }
-  keys.av  = { m_editing.smart_paste           }
+  keys.az  = { 'undo', b  }
+  keys.aZ  = { 'redo', b  }
+  keys.ax  = { 'cut', b   }
+  keys.ac  = { 'copy', b  }
+  keys.av  = { 'paste', b }
   -- Delete is delete.
   keys.aa  = { 'select_all', b }
   keys.cm  = { m_editing.match_brace              }
@@ -325,9 +322,7 @@ else
   -- TODO: { m_editing.convert_indentation }
   keys.ck = { m_editing.smart_cutcopy }
   -- TODO: { m_editing.smart_cutcopy, 'copy' }
-  keys.cy = { m_editing.smart_paste            }
-  keys.ay = { m_editing.smart_paste, 'cycle'   }
-  keys.aY = { m_editing.smart_paste, 'reverse' }
+  keys.cy = { 'paste', b }
   keys.cc = { -- enClose in...
     t     = { m_editing.enclose, 'tag'        },
     T     = { m_editing.enclose, 'single_tag' },
diff --git a/core/ext/menu.lua b/core/ext/menu.lua
index 40b2bdfa..49e46126 100644
--- a/core/ext/menu.lua
+++ b/core/ext/menu.lua
@@ -42,11 +42,6 @@ local ID = {
   SQUEEZE = 213,
   JOIN_LINES = 245,
   CONVERT_INDENTATION = 216,
-  CUT_TO_LINE_END = 217,
-  COPY_TO_LINE_END = 218,
-  PASTE_FROM_RING = 219,
-  PASTE_NEXT_FROM_RING = 220,
-  PASTE_PREV_FROM_RING = 221,
   ENCLOSE_IN_HTML_TAGS = 224,
   ENCLOSE_IN_HTML_SINGLE_TAG = 225,
   ENCLOSE_IN_DOUBLE_QUOTES = 226,
@@ -170,13 +165,6 @@ local menubar = {
     { l.MENU_EDIT_SQUEEZE, ID.SQUEEZE },
     { l.MENU_EDIT_JOIN_LINES, ID.JOIN_LINES },
     { l.MENU_EDIT_CONVERT_INDENTATION, ID.CONVERT_INDENTATION },
-    { title = l.MENU_EDIT_KR_TITLE,
-      { l.MENU_EDIT_KR_CUT_TO_LINE_END, ID.CUT_TO_LINE_END },
-      { l.MENU_EDIT_KR_COPY_TO_LINE_END, ID.COPY_TO_LINE_END },
-      { l.MENU_EDIT_KR_PASTE_FROM, ID.PASTE_FROM_RING },
-      { l.MENU_EDIT_KR_PASTE_NEXT_FROM, ID.PASTE_NEXT_FROM_RING },
-      { l.MENU_EDIT_KR_PASTE_PREV_FROM, ID.PASTE_PREV_FROM_RING },
-    },
     { title = l.MENU_EDIT_SEL_TITLE,
       { title = l.MENU_EDIT_SEL_ENC_TITLE,
         { l.MENU_EDIT_SEL_ENC_HTML_TAGS, ID.ENCLOSE_IN_HTML_TAGS },
@@ -394,12 +382,6 @@ local actions = {
   [ID.SQUEEZE] = { m_editing.squeeze },
   [ID.JOIN_LINES] = { m_editing.join_lines },
   [ID.CONVERT_INDENTATION] = { m_editing.convert_indentation },
-  -- Edit -> Kill Ring
-  [ID.CUT_TO_LINE_END] = { m_editing.smart_cutcopy },
-  [ID.COPY_TO_LINE_END] = { m_editing.smart_cutcopy, 'copy' },
-  [ID.PASTE_FROM_RING] = { m_editing.smart_paste },
-  [ID.PASTE_NEXT_FROM_RING] = { m_editing.smart_paste, 'cycle' },
-  [ID.PASTE_PREV_FROM_RING] = { m_editing.smart_paste, 'reverse' },
   -- Edit -> Selection -> Enclose in...
   [ID.ENCLOSE_IN_HTML_TAGS] = { m_editing.enclose, 'tag' },
   [ID.ENCLOSE_IN_HTML_SINGLE_TAG] = { m_editing.enclose, 'single_tag' },
@@ -494,7 +476,6 @@ local actions = {
               _RELEASE, '--no-cancel'
   },
 }
-if MAC then actions[ID.PASTE] = { m_editing.smart_paste } end -- fix paste issue
 
 -- Most of this handling code comes from keys.lua.
 t.events.add_handler('menu_clicked',
diff --git a/core/locale.conf b/core/locale.conf
index f7c1e519..b4abb7ef 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -263,30 +263,6 @@ MENU_EDIT_JOIN_LINES "_Join Lines"
 % "Convert _Indentation"
 MENU_EDIT_CONVERT_INDENTATION "Convert _Indentation"
 
-% core/ext/menu.lua
-% "_Kill Ring"
-MENU_EDIT_KR_TITLE "_Kill Ring"
-
-% core/ext/menu.lua
-% "_Cut to Line End"
-MENU_EDIT_KR_CUT_TO_LINE_END "_Cut to Line End"
-
-% core/ext/menu.lua
-% "C_opy to Line End"
-MENU_EDIT_KR_COPY_TO_LINE_END "C_opy to Line End"
-
-% core/ext/menu.lua
-% "_Paste From"
-MENU_EDIT_KR_PASTE_FROM "_Paste From"
-
-% core/ext/menu.lua
-% "Paste _Next From"
-MENU_EDIT_KR_PASTE_NEXT_FROM "Paste _Next From"
-
-% core/ext/menu.lua
-% "Paste _Previous From"
-MENU_EDIT_KR_PASTE_PREV_FROM "Paste _Previous From"
-
 % core/ext/menu.lua
 % "S_election"
 MENU_EDIT_SEL_TITLE "S_election"
-- 
cgit v1.2.3