branch: externals/ergoemacs-mode
commit 8cf95f4beb0e799122212cda95a6c1d73c21aeea
Author: Matthew Fidler <[email protected]>
Commit: Matthew Fidler <[email protected]>
Spacing changes
---
ergoemacs-mode.el | 97 +++++++++++++++++++++++++++----------------------------
1 file changed, 47 insertions(+), 50 deletions(-)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 94b90947bf..193e89c58a 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -131,43 +131,44 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and
end-of-buffer Alt+Shift+n"
:type 'boolean
:group 'ergoemacs-mode)
-(defvar ergoemacs--send-emacs-keys-map (let ((map (make-sparse-keymap)))
- (define-key map [remap kill-line]
'ergoemacs-kill-line)
- (define-key map [remap
mark-whole-buffer] 'ergoemacs-mark-whole-buffer)
- (define-key map [remap find-file]
'ergoemacs-find-file)
- (define-key map [remap save-buffer]
'ergoemacs-save-buffer)
- (define-key map [remap write-file]
'ergoemacs-write-file)
- (define-key map [remap goto-line]
'ergoemacs-goto-line)
- (define-key map [remap delete-char]
'ergoemacs-delete-char)
- (define-key map [remap
move-beginning-of-line] 'ergoemacs-move-beginning-of-line)
- (define-key map [remap
move-end-of-line] 'ergoemacs-move-end-of-line)
- (define-key map [remap
set-mark-command] 'ergoemacs-set-mark-command)
- (define-key map [remap
delete-backward-char] 'ergoemacs-delete-backward-char)
- (define-key map [remap delete-char]
'ergoemacs-delete-char)
- (define-key map [remap kill-word]
'ergoemacs-kill-word)
- (define-key map [remap
backward-kill-word] 'ergoemacs-backward-kill-word)
- (define-key map [remap backward-word]
'ergoemacs-backward-word)
- (define-key map [remap forward-word]
'ergoemacs-forward-word)
- (define-key map [remap
backward-paragraph] 'ergoemacs-backward-paragraph)
- (define-key map [remap
forward-paragraph] 'ergoemacs-forward-paragraph)
- (define-key map [remap
scroll-down-command] 'ergoemacs-scroll-down-command)
- (define-key map [remap
scroll-up-command] 'ergoemacs-scroll-up-command)
- (define-key map [remap end-of-buffer]
'ergoemacs-end-of-buffer)
- (define-key map [remap
beginning-of-buffer] 'ergoemacs-beginning-of-buffer)
- (define-key map [remap query-replace]
'ergoemacs-query-replace)
- (define-key map [remap
query-replace-regexp] 'ergoemacs-query-replace-regexp)
- (define-key map [remap other-window]
'ergoemacs-other-window)
- (define-key map [remap
delete-other-windows] 'ergoemacs-delete-other-windows)
- (define-key map [remap delete-window]
'ergoemacs-delete-window)
- (define-key map [remap
split-window-below] 'ergoemacs-split-window-below)
- (define-key map [remap
split-window-right] 'ergoemacs-split-window-right)
- (define-key map [remap
switch-to-buffer] 'ergoemacs-switch-to-buffer)
- (define-key map [remap
recenter-top-bottom] 'ergoemacs-recenter-top-bottom)
- (define-key map [remap shell-command]
'ergoemacs-shell-command)
- (define-key map [remap comment-dwim]
'ergoemacs-comment-dwim)
- (define-key map [remap
delete-horizontal-space] 'ergoemacs-delete-horizontal-space)
- (define-key map [remap
mark-paragraph] 'ergoemacs-mark-paragraph)
- map)
+(defvar ergoemacs--send-emacs-keys-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map [remap kill-line] 'ergoemacs-kill-line)
+ (define-key map [remap mark-whole-buffer] 'ergoemacs-mark-whole-buffer)
+ (define-key map [remap find-file] 'ergoemacs-find-file)
+ (define-key map [remap save-buffer] 'ergoemacs-save-buffer)
+ (define-key map [remap write-file] 'ergoemacs-write-file)
+ (define-key map [remap goto-line] 'ergoemacs-goto-line)
+ (define-key map [remap delete-char] 'ergoemacs-delete-char)
+ (define-key map [remap move-beginning-of-line]
'ergoemacs-move-beginning-of-line)
+ (define-key map [remap move-end-of-line] 'ergoemacs-move-end-of-line)
+ (define-key map [remap set-mark-command] 'ergoemacs-set-mark-command)
+ (define-key map [remap delete-backward-char]
'ergoemacs-delete-backward-char)
+ (define-key map [remap delete-char] 'ergoemacs-delete-char)
+ (define-key map [remap kill-word] 'ergoemacs-kill-word)
+ (define-key map [remap backward-kill-word] 'ergoemacs-backward-kill-word)
+ (define-key map [remap backward-word] 'ergoemacs-backward-word)
+ (define-key map [remap forward-word] 'ergoemacs-forward-word)
+ (define-key map [remap backward-paragraph] 'ergoemacs-backward-paragraph)
+ (define-key map [remap forward-paragraph] 'ergoemacs-forward-paragraph)
+ (define-key map [remap scroll-down-command] 'ergoemacs-scroll-down-command)
+ (define-key map [remap scroll-up-command] 'ergoemacs-scroll-up-command)
+ (define-key map [remap end-of-buffer] 'ergoemacs-end-of-buffer)
+ (define-key map [remap beginning-of-buffer] 'ergoemacs-beginning-of-buffer)
+ (define-key map [remap query-replace] 'ergoemacs-query-replace)
+ (define-key map [remap query-replace-regexp]
'ergoemacs-query-replace-regexp)
+ (define-key map [remap other-window] 'ergoemacs-other-window)
+ (define-key map [remap delete-other-windows]
'ergoemacs-delete-other-windows)
+ (define-key map [remap delete-window] 'ergoemacs-delete-window)
+ (define-key map [remap split-window-below] 'ergoemacs-split-window-below)
+ (define-key map [remap split-window-right] 'ergoemacs-split-window-right)
+ (define-key map [remap switch-to-buffer] 'ergoemacs-switch-to-buffer)
+ (define-key map [remap recenter-top-bottom] 'ergoemacs-recenter-top-bottom)
+ (define-key map [remap shell-command] 'ergoemacs-shell-command)
+ (define-key map [remap comment-dwim] 'ergoemacs-comment-dwim)
+ (define-key map [remap delete-horizontal-space]
'ergoemacs-delete-horizontal-space)
+ (define-key map [remap mark-paragraph] 'ergoemacs-mark-paragraph)
+ map)
"This defines the remaps for the `ergoemacs-mode-send-emacs-keys' commands.")
(defun ergoemacs-mode-line (&optional text)
@@ -348,11 +349,6 @@ The `execute-extended-command' is now
\\[execute-extended-command].
(ergoemacs-setup-override-keymap))
(t (ergoemacs-setup-override-keymap)))
(setq ergoemacs-require--ini-p t)
- ;;(define-key key-translation-map (kbd "<apps>") (kbd "<menu>"))
- ;;(global-unset-key (kbd "<apps>"))
- ;;(global-unset-key (kbd "<menu>"))
- ;;(define-key ergoemacs-translate--parent-map [apps]
'ergoemacs-command-loop--swap-translation)
- ;;(define-key ergoemacs-translate--parent-map [menu]
'ergoemacs-command-loop--swap-translation)
(message "Ergoemacs-mode turned ON (%s)." ergoemacs-keyboard-layout))
;; Turn off
@@ -477,14 +473,15 @@ after initializing ergoemacs-mode.
"This is the `ergoemacs-mode' terminal raw keymap. Only Meta/alt keys are
applied.")
(defun ergoemacs-setup-override-keymap ()
"Setup `ergoemacs-mode' keymaps."
- (setq ergoemacs-override-alist `((ergeoemacs-mode-term-raw-mode .
,ergoemacs-mode-term-raw-keymap)
- (ergoemacs--ena-prefix-override-keymap .
,ergoemacs--prefix-override-keymap)
- (ergoemacs--ena-prefix-repeat-keymap .
,ergoemacs--prefix-repeat-keymap)
- (ergoemacs--ena-region-keymap .
,ergoemacs-mark-active-keymap)
- (ergoemacs-mode-regular .
,ergoemacs-user-keymap)
- (ergoemacs-mode-regular .
,ergoemacs-override-keymap)
- (ergoemacs-mode-regular . ,ergoemacs-keymap)
- (ergoemacs-mode-send-emacs-keys .
,ergoemacs--send-emacs-keys-map)))
+ (setq ergoemacs-override-alist
+ `((ergeoemacs-mode-term-raw-mode . ,ergoemacs-mode-term-raw-keymap)
+ (ergoemacs--ena-prefix-override-keymap .
,ergoemacs--prefix-override-keymap)
+ (ergoemacs--ena-prefix-repeat-keymap .
,ergoemacs--prefix-repeat-keymap)
+ (ergoemacs--ena-region-keymap . ,ergoemacs-mark-active-keymap)
+ (ergoemacs-mode-regular . ,ergoemacs-user-keymap)
+ (ergoemacs-mode-regular . ,ergoemacs-override-keymap)
+ (ergoemacs-mode-regular . ,ergoemacs-keymap)
+ (ergoemacs-mode-send-emacs-keys . ,ergoemacs--send-emacs-keys-map)))
(add-hook 'emulation-mode-map-alists ergoemacs-override-alist)
(advice-add 'undefined :around #'ergoemacs-advice-undefined)
(advice-add 'read-key :around #'ergoemacs-read-key))
