From ee5b7eb3b57a85f88522f64d9645954b43cdd262 Mon Sep 17 00:00:00 2001
From: Mitchell <mitchellb@activestate.com>
Date: Tue, 1 Dec 2015 10:11:16 -0500
Subject: [PATCH] Revert "editing: Added command and keybindings to remove
 previously selected word in multi-caret session - fixes #869"

This reverts commit e05089655d78001e902edfa4b9bd7d6d2a014bbd.
---
 .../komodo/content/commandsOverlay.p.xul      |  5 ----
 src/chrome/komodo/content/editor.js           | 27 -------------------
 .../content/keybindings/keybindings.p.js      |  8 +-----
 src/chrome/komodo/content/komodo.p.xul        |  7 -----
 src/chrome/komodo/locale/en-US/komodo.dtd     |  2 --
 src/schemes/Default.p.kkf                     |  4 +--
 src/schemes/Emacs.p.kkf                       |  3 +--
 src/schemes/Mac.p.kkf                         |  3 +--
 8 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/src/chrome/komodo/content/commandsOverlay.p.xul b/src/chrome/komodo/content/commandsOverlay.p.xul
index 8dcd3542de..bf7e88c6d6 100644
--- a/src/chrome/komodo/content/commandsOverlay.p.xul
+++ b/src/chrome/komodo/content/commandsOverlay.p.xul
@@ -1567,11 +1567,6 @@
             disabled="true"
             desc="&generalPrintPreviewSelection.desc;"/>
 <!-- #endif -->
-        <command
-            id="cmd_removePrevWordInCaretSet" key="key_cmd_removePrevWordInCaretSet"
-            oncommand="ko.commands.doCommandAsync('cmd_removePrevWordInCaretSet', event)"
-            disabled="true"
-            desc="&removePrevWordInCaretSet.desc;"/>
     </commandset>
     
     <!-- These commands need to be updated on window open,
diff --git a/src/chrome/komodo/content/editor.js b/src/chrome/komodo/content/editor.js
index c90839e2e1..5c7b69f832 100644
--- a/src/chrome/komodo/content/editor.js
+++ b/src/chrome/komodo/content/editor.js
@@ -584,33 +584,6 @@ editor_editorController.prototype.do_cmd_addNextWordToCaretSet = function() {
         scimoz.searchFlags |= scimoz.SCFIND_WHOLEWORD;
     }
     scimoz.multipleSelectAddNext();
-    scimoz.sendUpdateCommands("select");
-};
-
-var is_cmd_removeAdditionalCaret_enabled_aux = function() {
-    var view = _getCurrentScimozView();
-    if (!view) {
-        return null;
-    }
-    var scimoz = view.scimoz;
-    if (!scimoz) {
-        return null;
-    }
-    return (scimoz.selections > 1) ? view : null;
-};
-
-editor_editorController.prototype.is_cmd_removePrevWordInCaretSet_enabled = function() {
-    return !!is_cmd_removeAdditionalCaret_enabled_aux();
-}
-  
-editor_editorController.prototype.do_cmd_removePrevWordInCaretSet = function() {
-    var view = is_cmd_removeAdditionalCaret_enabled_aux();
-    if (!view) {
-        return;
-    }
-    var scimoz = view.scimoz;
-    scimoz.dropSelectionN(scimoz.selections - 1);
-    scimoz.sendUpdateCommands("select");
 };
 
 editor_editorController.prototype._aux_is_cmd_rename_tag_enabled = function() {
diff --git a/src/chrome/komodo/content/keybindings/keybindings.p.js b/src/chrome/komodo/content/keybindings/keybindings.p.js
index 6199dbd4e7..a1653f73c9 100644
--- a/src/chrome/komodo/content/keybindings/keybindings.p.js
+++ b/src/chrome/komodo/content/keybindings/keybindings.p.js
@@ -331,7 +331,6 @@ function cloneObject(what) {
  *       existing keybindings to move to the state you're implementing for N+1
  *
  * Version history:
- * 49: Komodo 10.0 - add Ctrl+Shift+D for cmd_removePrevWordInCaretSet
  * 48: Komodo 9.3 - Ctrl+T is now used for new tabs
  * 47: Komodo 9.3 - Add keybindings for quick bookmarks
  *                  Juggle help (and friends) and commenting keybindings to
@@ -381,7 +380,7 @@ function cloneObject(what) {
  * 2: Komodo 4.2.0-beta2 and above
  * 1: Komodo 4.2.0-beta1 and before
  */
-const currentKeybindingVersionNumber = 49;
+const currentKeybindingVersionNumber = 48;
 
 /**
  * Remove this dictionary of keybinds.
@@ -1064,11 +1063,6 @@ this.Manager.prototype._upgradeKeybingings = function (from_version,
             });
 // #endif
             break;
-        case 49:
-            this._add_keybinding_sequences({
-                    'cmd_removePrevWordInCaretSet': ["Ctrl+Shift+D"],
-                });
-            break;
         }
         from_version += 1;
     }
diff --git a/src/chrome/komodo/content/komodo.p.xul b/src/chrome/komodo/content/komodo.p.xul
index f2474e2841..d57d350d5c 100644
--- a/src/chrome/komodo/content/komodo.p.xul
+++ b/src/chrome/komodo/content/komodo.p.xul
@@ -278,9 +278,6 @@
                 <menuitem id="editor-context-addNextWordToCaretSet"
                           label="&addNextWordToCaretSet.label;"
                           observes="cmd_addNextWordToCaretSet"/>
-                <menuitem id="editor-context-removePrevWordInCaretSet"
-                          label="&removePrevWordInCaretSet.label;"
-                          observes="cmd_removePrevWordInCaretSet"/>
             </menupopup>
         </menu>
         <menuitem id="editor-context-find"
@@ -858,10 +855,6 @@
                                               id="menu_addNextWordToCaretSet"
                                               observes="cmd_addNextWordToCaretSet"
                                               />
-                                    <menuitem label="&removePrevWordInCaretSet.label;"
-                                              id="menu_removePrevWordInCaretSet"
-                                              observes="cmd_removePrevWordInCaretSet"
-                                              />
                                 </menupopup>
                             </menu>
 
diff --git a/src/chrome/komodo/locale/en-US/komodo.dtd b/src/chrome/komodo/locale/en-US/komodo.dtd
index c10c3c64c0..afd78b384f 100644
--- a/src/chrome/komodo/locale/en-US/komodo.dtd
+++ b/src/chrome/komodo/locale/en-US/komodo.dtd
@@ -603,8 +603,6 @@
 <!ENTITY quitApplicationCmdMac.accesskey "Q">
 <!ENTITY quitApplicationCmdWin.label "Exit">
 <!ENTITY quitApplicationCmdWin.accesskey "x">
-<!ENTITY removePrevWordInCaretSet.label "Multiple Selection - Remove Previous Occurrence">
-<!ENTITY removePrevWordInCaretSet.desc "Editor: Remove Previous Word in a Multi-Caret Set">
 <!ENTITY rename.label "Rename...">
 <!ENTITY renameTag.label "Rename Tag">
 <!ENTITY renameTag.desc "Editor: Rename Start- and End-Tag Name Simultaneously">
diff --git a/src/schemes/Default.p.kkf b/src/schemes/Default.p.kkf
index 960345b15b..c05bb97f8d 100644
--- a/src/schemes/Default.p.kkf
+++ b/src/schemes/Default.p.kkf
@@ -1,4 +1,4 @@
-version 49
+version 48
 
 # Movement and selection
 binding cmd_left  Left
@@ -224,5 +224,3 @@ binding cmd_scope-openfiles Ctrl+<
 binding cmd_invokeHyperlink Ctrl+Shift+G
 
 binding cmd_addNextWordToCaretSet Ctrl+D
-binding cmd_removePrevWordInCaretSet Ctrl+Shift+D
-
diff --git a/src/schemes/Emacs.p.kkf b/src/schemes/Emacs.p.kkf
index 49124202ab..568d09efb0 100644
--- a/src/schemes/Emacs.p.kkf
+++ b/src/schemes/Emacs.p.kkf
@@ -1,4 +1,4 @@
-version 49
+version 48
 
 # Needs a few things to be finished
 #  - ?? insert forward tab / insert backward tab
@@ -231,4 +231,3 @@ binding cmd_scope-openfiles Ctrl+<
 binding cmd_invokeHyperlink Ctrl+Shift+G
 
 #binding cmd_addNextWordToCaretSet Ctrl+K Ctrl+D
-#binding cmd_removePrevWordInCaretSet Ctrl+K Ctrl+D
diff --git a/src/schemes/Mac.p.kkf b/src/schemes/Mac.p.kkf
index 7c4d79ecc4..79a43f8663 100644
--- a/src/schemes/Mac.p.kkf
+++ b/src/schemes/Mac.p.kkf
@@ -1,4 +1,4 @@
-version 49
+version 48
 
 binding cmd_back  Shift+Backspace
 binding cmd_backSmart  Backspace
@@ -193,7 +193,6 @@ binding cmd_scope-openfiles Meta+<
 binding cmd_invokeHyperlink Ctrl+Shift+G
 
 binding cmd_addNextWordToCaretSet Ctrl+D
-binding cmd_removePrevWordInCaretSet Ctrl+Shift+D
 binding cmd_htmlTagRelocator Ctrl+Shift+Z
 
 binding cmd_lineTransposeUp  Ctrl+Up