[elpa] externals/ergoemacs-mode 1bd971e 137/325: Remove iswitchb bindings and misc cleanup

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit 1bd971eb1b32c3afe711f86c7d778f30ff3ffb03
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Remove iswitchb bindings and misc cleanup
---
 ergoemacs-themes.el | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index aba2392..4825ced 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -379,15 +379,6 @@ calling any other ergoemacs-set-* function"
   )  
 
 ;;; Variable Components
-(ergoemacs-component move-char ()
-  "Movement by Characters & Set Mark"
-
-  ;; Mode specific changes
-  (when iswitchb-define-mode-map-hook 
-    (define-key iswitchb-mode-map [remap backward-char] 'iswitchb-prev-match)
-    (define-key iswitchb-mode-map [remap forward-char] 'iswitchb-next-match))
-  )
-  
 (defun ergoemacs-set-move-word ()
   "Moving around and deleting words"
   (ergoemacs-global-set-key (kbd "M-u") 'backward-word)
@@ -467,13 +458,6 @@ calling any other ergoemacs-set-* function"
   (ergoemacs-define-key isearch-mode-map (kbd "C-S-v") 'ergoemacs-paste-cycle)
   )  
 
-(ergoemacs-component copy ()
-  "Copy, Cut, Paste, Redo and Undo"
-  
-  ;; (define-key calc-mode-map [remap ergoemacs-paste] 'calc-yank)
-  ;; (define-key calc-mode-map [remap undo-tree-undo] 'calc-undo)
-  )
-
 (defun ergoemacs-set-search ()
   "Search and Replace"
   (ergoemacs-global-set-key (kbd "M-5") 'query-replace)
@@ -556,12 +540,6 @@ calling any other ergoemacs-set-* function"
   (define-key isearch-mode-map (kbd "M-/") 'isearch-toggle-case-fold)
   )
 
-(ergoemacs-component text-transform ()
-  "Text Transformation"
-  (when iswitchb-define-mode-map-hook
-    (define-key iswitchb-mode-map [remap ergoemacs-toggle-camel-case] 
'iswitchb-toggle-case)
-    (define-key iswitchb-mode-map [remap ergoemacs-toggle-letter-case] 
'iswitchb-toggle-regexp)))
-
 (defun ergoemacs-set-select-items ()
   "Select Items"
   (ergoemacs-global-set-key (kbd "M-S-SPC") 'mark-paragraph)
@@ -1135,13 +1113,10 @@ calling any other ergoemacs-set-* function"
 
 (ergoemacs-theme standard ()
   "Standard Ergoemacs Theme"
-  :components '(copy
-                dired-tab
+  :components '(dired-tab
                 dired-to-wdired
-                move-char
                 move-line
                 search
-                text-transform
                 ergoemacs-remaps)
   :optional-on '(backspace-del-seq
                  standard-fixed
@@ -1149,7 +1124,7 @@ calling any other ergoemacs-set-* function"
                  multiple-cursors-remaps
                  quit
                  )
-  :options-menu '(("Remaps" (ido-remaps multiple-cursors-remaps icy-reclaim))
+  :options-menu '(("Remaps" (ido-remaps multiple-cursors-remaps))
                   ("Standard Keys" (standard-fixed quit))
                   ("Keys during Key Sequence" (backspace-del-seq))
                   ("Packages" (avy multiple-cursors expand-region))