branch: externals/ergoemacs-mode
commit f76cc5efb7b35d01758e0180b9a0171cdad700cb
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Turn off pre-post command hooks and make term bindings work.
---
ergoemacs-mode.el | 20 +++++++++------
ergoemacs-themes.el | 70 ++++++++++++++++++++++++-----------------------------
2 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index dab6c00..f27994d 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -276,6 +276,9 @@ The `execute-extended-command' is now
\\[execute-extended-command].
:keymap ergoemacs-menu-keymap
(setq ergoemacs-mode--start-p t)
(setq ergoemacs-map--hashkey nil)
+
+ ;; (ergoemacs-install-standard-theme)
+
(unless ergoemacs-require--ini-p
(setq ergoemacs-require--ini-p :ini)
(when ergoemacs-require
@@ -288,14 +291,15 @@ The `execute-extended-command' is now
\\[execute-extended-command].
(setq ergoemacs-mode--default-frame-alist nil)
(dolist (elt (reverse default-frame-alist))
(push elt ergoemacs-mode--default-frame-alist))
+ (ergoemacs-install-standard-theme)
(run-hooks 'ergoemacs-mode-startup-hook)
- (add-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
- (add-hook 'post-command-hook #'ergoemacs-post-command-hook)
- (add-hook 'after-load-functions #'ergoemacs-after-load-functions)
- (add-hook 'after-load-functions
#'ergoemacs-mode-after-startup-run-load-hooks)
+ ;; (add-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
+ ;; (add-hook 'post-command-hook #'ergoemacs-post-command-hook)
+ ;; (add-hook 'after-load-functions #'ergoemacs-after-load-functions)
+ ;; (add-hook 'after-load-functions
#'ergoemacs-mode-after-startup-run-load-hooks)
(setq ergoemacs-require--ini-p t)
- (ergoemacs-setup-override-keymap)
+ (ergoemacs-setup-override-keymap)
(if refresh-p
(message "Ergoemacs-mode keys refreshed (%s)"
ergoemacs-keyboard-layout)
(message "Ergoemacs-mode turned ON (%s)."
ergoemacs-keyboard-layout)
@@ -307,9 +311,9 @@ The `execute-extended-command' is now
\\[execute-extended-command].
(modify-all-frames-parameters (list (cons 'cursor-type 'box))))
(setq ergoemacs-mode--default-frame-alist nil)
(run-hooks 'ergoemacs-mode-shutdown-hook)
- (remove-hook 'post-command-hook #'ergoemacs-post-command-hook)
- (remove-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
- (remove-hook 'after-load-functions #'ergoemacs-after-load-functions)
+ ;; (remove-hook 'post-command-hook #'ergoemacs-post-command-hook)
+ ;; (remove-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
+ ;; (remove-hook 'after-load-functions #'ergoemacs-after-load-functions)
(unless refresh-p
(message "Ergoemacs-mode turned OFF.")
)
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index d2c50f1..30ca5c7 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -363,10 +363,6 @@ calling any other ergoemacs-set-* function"
(define-key isearch-mode-map (kbd "C-v") 'ergoemacs-paste)
)
-(ergoemacs-component backspace-del-seq ()
- "Backspace deletes last key entered in command sequence"
- (define-key ergoemacs-translate--parent-map (kbd "DEL")
'ergoemacs-command-loop--force-undo-last))
-
(defun ergoemacs-set-help ()
"Help changes for ergoemacs-mode"
(global-set-key (kbd "C-h '") 'ergoemacs-describe-current-theme)
@@ -1073,8 +1069,6 @@ calling any other ergoemacs-set-* function"
(ergoemacs-theme standard ()
"Standard Ergoemacs Theme"
- :optional-on '(backspace-del-seq
- )
)
(defun ergoemacs-install-standard-theme ()
@@ -1137,45 +1131,45 @@ calling any other ergoemacs-set-* function"
(define-key term-raw-map (kbd "C-n") 'ergoemacs-new-empty-buffer)
(define-key term-raw-map (kbd "C-p") 'pr-interface)
- ;; (define-key term-raw-map (kbd "M-j") 'backward-char)
- ;; (define-key term-raw-map (kbd "M-l") 'forward-char)
- ;; (define-key term-raw-map (kbd "M-i") 'previous-line)
- ;; (define-key term-raw-map (kbd "M-k") 'next-line)
- (define-key term-raw-map (kbd "M-SPC") 'set-mark-command)
+ (ergoemacs-define-key term-raw-map (kbd "M-j") 'backward-char)
+ (ergoemacs-define-key term-raw-map (kbd "M-l") 'forward-char)
+ (ergoemacs-define-key term-raw-map (kbd "M-i") 'previous-line)
+ (ergoemacs-define-key term-raw-map (kbd "M-k") 'next-line)
+ (ergoemacs-define-key term-raw-map (kbd "M-SPC") 'set-mark-command)
- ;; (define-key term-raw-map (kbd "M-u") 'backward-word)
- ;; (define-key term-raw-map (kbd "M-o") 'forward-word)
+ (ergoemacs-define-key term-raw-map (kbd "M-u") 'backward-word)
+ (ergoemacs-define-key term-raw-map (kbd "M-o") 'forward-word)
- ;; (define-key term-raw-map (kbd "M-U") 'backward-paragraph)
- ;; (define-key term-raw-map (kbd "M-O") 'forward-paragraph)
+ (ergoemacs-define-key term-raw-map (kbd "M-U") 'backward-paragraph)
+ (ergoemacs-define-key term-raw-map (kbd "M-O") 'forward-paragraph)
- ;; (define-key term-raw-map (kbd "M-h") 'move-beginning-of-line)
- ;; (define-key term-raw-map (kbd "M-H") 'move-end-of-line)
+ (ergoemacs-define-key term-raw-map (kbd "M-h") 'move-beginning-of-line)
+ (ergoemacs-define-key term-raw-map (kbd "M-H") 'move-end-of-line)
- ;; (define-key term-raw-map (kbd "M-I") 'scroll-down)
- ;; (define-key term-raw-map (kbd "M-K") 'scroll-up)
+ (ergoemacs-define-key term-raw-map (kbd "M-I") 'scroll-down)
+ (ergoemacs-define-key term-raw-map (kbd "M-K") 'scroll-up)
- ;; (define-key term-raw-map (kbd "M-n")
'ergoemacs-beginning-or-end-of-buffer)
- ;; (define-key term-raw-map (kbd "M-N")
'ergoemacs-end-or-beginning-of-buffer)
+ (ergoemacs-define-key term-raw-map (kbd "M-n")
'ergoemacs-beginning-or-end-of-buffer)
+ (ergoemacs-define-key term-raw-map (kbd "M-N")
'ergoemacs-end-or-beginning-of-buffer)
- ;; (define-key term-raw-map (kbd "M-J") 'ergoemacs-backward-open-bracket)
- ;; (define-key term-raw-map (kbd "M-L") 'ergoemacs-forward-close-bracket)
+ (ergoemacs-define-key term-raw-map (kbd "M-J")
'ergoemacs-backward-open-bracket)
+ (ergoemacs-define-key term-raw-map (kbd "M-L")
'ergoemacs-forward-close-bracket)
- ;; (define-key term-raw-map (kbd "M-c") 'ergoemacs-copy-line-or-region)
- ;; (define-key term-raw-map (kbd "M-v") 'term-paste)
- ;; (define-key term-raw-map (kbd "M-C") 'ergoemacs-copy-all)
-
- ;; (define-key term-raw-map (kbd "M-;") 'isearch-forward)
- ;; (define-key term-raw-map (kbd "M-:") 'isearch-backward)
-
- ;; (define-key term-raw-map (kbd "M-s") 'ergoemacs-move-cursor-next-pane)
- ;; (define-key term-raw-map (kbd "M-S") 'ergoemacs-move-cursor-previous-pane)
- ;; (define-key term-raw-map (kbd "M-~") 'ergoemacs-switch-to-previous-frame)
- ;; (define-key term-raw-map (kbd "M-`") 'ergoemacs-switch-to-next-frame)
- ;; (define-key term-raw-map (kbd "M-3") 'delete-other-windows)
- ;; (define-key term-raw-map (kbd "M-2") 'delete-window)
- ;; (define-key term-raw-map (kbd "M-4") '(split-window-below
split-window-horizontally))
- ;; (define-key term-raw-map (kbd "M-$") '(split-window-right
split-window-vertically))
+ (ergoemacs-define-key term-raw-map (kbd "M-c")
'ergoemacs-copy-line-or-region)
+ (ergoemacs-define-key term-raw-map (kbd "M-v") 'term-paste)
+ (ergoemacs-define-key term-raw-map (kbd "M-C") 'ergoemacs-copy-all)
+
+ (ergoemacs-define-key term-raw-map (kbd "M-;") 'isearch-forward)
+ (ergoemacs-define-key term-raw-map (kbd "M-:") 'isearch-backward)
+
+ (ergoemacs-define-key term-raw-map (kbd "M-s")
'ergoemacs-move-cursor-next-pane)
+ (ergoemacs-define-key term-raw-map (kbd "M-S")
'ergoemacs-move-cursor-previous-pane)
+ (ergoemacs-define-key term-raw-map (kbd "M-~")
'ergoemacs-switch-to-previous-frame)
+ (ergoemacs-define-key term-raw-map (kbd "M-`")
'ergoemacs-switch-to-next-frame)
+ (ergoemacs-define-key term-raw-map (kbd "M-3") 'delete-other-windows)
+ (ergoemacs-define-key term-raw-map (kbd "M-2") 'delete-window)
+ (ergoemacs-define-key term-raw-map (kbd "M-4") '(split-window-below
split-window-horizontally))
+ (ergoemacs-define-key term-raw-map (kbd "M-$") '(split-window-right
split-window-vertically))
)
(add-hook 'term-load-hook #'ergoemacs-install-term-bindings)
