branch: externals/ergoemacs-mode
commit 5fbcf0c1a16017481a9a2ea69f9a83b6433e7d1e
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Remove unchorded stuff and related tests
---
ergoemacs-command-loop.el | 1 -
ergoemacs-test.el | 40 ----------------------------------------
ergoemacs-theme-engine.el | 1 -
ergoemacs-themes.el | 30 ------------------------------
4 files changed, 72 deletions(-)
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 826c158..0c4b8f9 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -786,7 +786,6 @@ read."
reset-key-p
double)
- ;; (ergoemacs-command-loop--read-key (read-kbd-macro "C-x" t)
:unchorded-ctl)
(when (functionp text)
(setq text (funcall text)))
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index d27a861..08addb5 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -80,7 +80,6 @@
(declare-function ergoemacs-translate--quail-to-ergoemacs
"ergoemacs-translate")
(declare-function ergoemacs-translate-layout "ergoemacs-translate")
(declare-function ergoemacs-translate--get "ergoemacs-translate")
-(declare-function ergoemacs-unchorded-alt-modal "ergoemacs-translate")
(declare-function ergoemacs-translate--event-modifiers "ergoemacs-translate")
(require 'ert)
@@ -649,43 +648,6 @@ Grep finished (matches found) at Fri Aug 22 08:30:37
(call-interactively 'calc-quit)
(should (eq (key-binding (kbd "M-u")) 'previous-line)))))
-;;; Modal
-
-(ert-deftest ergoemacs-test-modal-preserve-mark ()
- "Issue #101.
-Test next and prior translation."
- (with-temp-buffer
- (insert ergoemacs-test-lorem-ipsum)
- (goto-char (point-min))
- (ergoemacs-translate--get :unchorded-alt) ;; Load translation
- (ergoemacs-unchorded-alt-modal)
- (set-mark (point))
- (forward-char 3)
- (ergoemacs-unchorded-alt-modal)
- (should mark-active)))
-
-(ert-deftest ergoemacs-test-modal-alt-mode-horizontal-position ()
- "Tests Issue #213"
- (let (ret)
- (ergoemacs-test-layout
- :layout "colemak"
- :macro "i u u"
- (save-excursion
- (switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
- (delete-region (point-min) (point-max))
- (insert ergoemacs-test-lorem-ipsum)
- (goto-char (point-max))
- (beginning-of-line)
- (ergoemacs-translate--get :unchorded-alt)
- (ergoemacs-unchorded-alt-modal)
- (execute-kbd-macro macro)
- (looking-at ".*? ")
- (ignore-errors (should (string= (match-string 0) "eprehenderit ")))
- (ergoemacs-unchorded-alt-modal)
- (kill-buffer (current-buffer))))))
-
-
-
;;; Command Loop
(ert-deftest ergoemacs-test-command-loop-apps-e-t-_ ()
@@ -1441,8 +1403,6 @@ Tests Issue #372."
"Test ergoemacs-mode translations"
:tags '(:translate)
(should (string= "A" (key-description (vector
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0))))))
- (should (string= "M-A" (key-description (vector
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0)
:unchorded-alt)))))
- (should (string= "C-S-a" (key-description (vector
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0)
:unchorded-ctl)))))
(should (string= "M-A" (key-description (vector
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-S-a" t) 0)
:ctl-to-alt)))))
;; DEL = ^?, doesn't seem to have the issues that RET, ESC, and TAB has.
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index be12fcd..6e3a6ba 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -737,7 +737,6 @@ See also `find-function-recenter-line' and
`find-function-after-hook'."
(ergoemacs-text-scale-normal-size "Reset Zoom")
(ergoemacs-toggle-camel-case "tog. camel")
(ergoemacs-toggle-letter-case "tog. case")
- (ergoemacs-unchorded-alt-modal "Alt+ Mode")
(ergoemacs-universal-argument "Argument")
(execute-extended-command "M-x")
(find-file "Open")
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 5dc5ae5..37b3411 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -400,7 +400,6 @@
(global-set-key (kbd "<f11>") 'previous-line)
(global-set-key (kbd "<f12>") 'next-line)
(global-set-key (kbd "<f3>") 'ergoemacs-copy-line-or-region)
- (global-set-key (kbd "<f6>") 'ergoemacs-unchorded-alt-modal)
(global-set-key (kbd "<f8>") 'search-map)
(global-set-key (kbd "<f8> <f8>") 'highlight-symbol-at-point)
(global-set-key (kbd "<f8> <f9>") 'highlight-symbol-query-replace)
@@ -812,7 +811,6 @@
"<apps> SPC" set-mark-command
"<apps> a" mark-whole-buffer
"<apps> d" ("C-x" :ctl-to-alt)
- "<apps> f" ("C-c" :unchorded-ctl)
"<apps> h" help-map
"<apps> h '" ergoemacs-describe-current-theme
"<apps> h 1" describe-function
@@ -1856,32 +1854,4 @@
(define-key map (read-kbd-macro "M-SPC")
'ergoemacs-read-key-force-next-key-is-alt)
map))
-(ergoemacs-translation unchorded-ctl ()
- "Make the Ctl key sticky."
- :text "<Ctl+>"
- :unchorded '(control)
- :shift '(control shift)
- :meta '()
- :control '(meta)
- :keymap (let ((map (make-sparse-keymap)))
- (define-key map [f1] 'ergoemacs-read-key-help)
- (define-key map (read-kbd-macro "SPC")
'ergoemacs-read-key-force-next-key-is-quoted)
- (define-key map (read-kbd-macro "M-SPC")
'ergoemacs-read-key-force-next-key-is-alt-ctl)
- (define-key map "g" 'ergoemacs-read-key-force-next-key-is-alt)
- (define-key map "G" 'ergoemacs-read-key-force-next-key-is-alt-ctl)
- map))
-
-(ergoemacs-translation unchorded-alt ()
- "Make the Alt key sticky."
- :text "<Alt+>"
- :unchorded '(meta)
- :shift '(meta shift)
- :meta '(meta shift)
- :modal-color "red"
- :keymap-modal (let ((map (make-sparse-keymap)))
- (define-key map (read-kbd-macro "<return>")
'ergoemacs-unchorded-alt-modal)
- (define-key map (read-kbd-macro "RET")
'ergoemacs-unchorded-alt-modal)
- map))
-
-
(provide 'ergoemacs-themes)
