[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode 72b0292 72/87: Make ergoemacs-handle-ctl
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode 72b0292 72/87: Make ergoemacs-handle-ctl-c-or-ctl-x==only-C-c-and-C-x work |
Date: |
Wed, 14 Apr 2021 18:47:10 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit 72b0292e860b15ff2f8df367d9ed2114ebb60a6b
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>
Make ergoemacs-handle-ctl-c-or-ctl-x==only-C-c-and-C-x work
---
ergoemacs-themes.el | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 2c60a98..c9935ce 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -244,7 +244,10 @@
(global-set-key (kbd "C-S-z") '(redo undo-tree-redo ergoemacs-redo))
(global-set-key (kbd "M-S-z") '(redo undo-tree-redo ergoemacs-redo))
(global-set-key (kbd "<S-delete>") 'ergoemacs-cut-line-or-region)
- (global-set-key (kbd "C-c <ergoemacs-timeout>")
'ergoemacs-copy-line-or-region)
+ (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
+ (global-set-key (kbd "C-c <ergoemacs-timeout>")
+ 'ergoemacs-copy-line-or-region)
+ )
(global-set-key (kbd "<C-insert>") 'ergoemacs-copy-line-or-region)
(global-set-key (kbd "C-S-v") 'ergoemacs-paste-cycle)
@@ -325,7 +328,9 @@
(global-set-key (kbd "C-x k") nil)
(global-set-key (kbd "C-w") 'ergoemacs-close-current-buffer)
- (global-set-key (kbd "C-x <ergoemacs-timeout>")
'ergoemacs-cut-line-or-region)
+ (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
+ (global-set-key (kbd "C-x <ergoemacs-timeout>")
'ergoemacs-cut-line-or-region)
+ )
(global-set-key (kbd "C-x C-b") 'ibuffer)
(global-set-key (kbd "C-y") '(redo undo-tree-redo ergoemacs-redo) "↷ redo")
@@ -367,7 +372,9 @@
(define-key isearch-mode-map (kbd "C-M-f") 'isearch-occur)
(define-key isearch-mode-map (kbd "<S-insert>") 'ergoemacs-paste)
(define-key isearch-mode-map (kbd "C-S-v") 'ergoemacs-paste-cycle)
- (define-key isearch-mode-map (kbd "C-c") 'isearch-yank-word-or-char)
+ (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
+ (define-key isearch-mode-map (kbd "C-c") 'isearch-yank-word-or-char)
+ )
(define-key isearch-mode-map (kbd "M-c") 'isearch-yank-word-or-char)
(define-key isearch-mode-map (kbd "M-v") 'ergoemacs-paste)
(define-key isearch-mode-map (kbd "C-v") 'ergoemacs-paste))
@@ -687,15 +694,21 @@
(global-set-key (kbd "M-z") '("C-_" :emacs))
;; Fixed Component; Note that <timeout> is the actual function.
- (global-set-key (kbd "C-c <ergoemacs-timeout>")
'ergoemacs-copy-line-or-region)
- (global-set-key (kbd "C-x <ergoemacs-timeout>")
'ergoemacs-cut-line-or-region)
+ (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
+ (progn
+ (global-set-key (kbd "C-c <ergoemacs-timeout>")
'ergoemacs-copy-line-or-region)
+ (global-set-key (kbd "C-x <ergoemacs-timeout>")
'ergoemacs-cut-line-or-region)
+ )
+ )
(global-set-key (kbd "C-S-x") ("C-x" :normal))
(global-set-key (kbd "C-z") 'undo)
(global-set-key (kbd "C-S-z") '(redo undo-tree-redo ergoemacs-redo))
(global-set-key (kbd "C-y") '(redo undo-tree-redo ergoemacs-redo))
;; Mode specific changes
- (define-key isearch-mode-map (kbd "C-c") 'isearch-yank-word-or-char)
+ (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
+ (define-key isearch-mode-map (kbd "C-c") 'isearch-yank-word-or-char)
+ )
(define-key isearch-mode-map (kbd "M-c") 'isearch-yank-word-or-char)
(define-key isearch-mode-map (kbd "M-v") 'ergoemacs-paste)
(define-key isearch-mode-map (kbd "M-V") 'ergoemacs-paste-cycle)
@@ -1880,8 +1893,12 @@
(ergoemacs-theme lvl0 ()
"CUA-mode style"
- (global-set-key (kbd "C-c <ergoemacs-timeout>")
'ergoemacs-copy-line-or-region)
- (global-set-key (kbd "C-x <ergoemacs-timeout>")
'ergoemacs-cut-line-or-region)
+ (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
+ (progn
+ (global-set-key (kbd "C-c <ergoemacs-timeout>")
'ergoemacs-copy-line-or-region)
+ (global-set-key (kbd "C-x <ergoemacs-timeout>")
'ergoemacs-cut-line-or-region)
+ )
+ )
(global-set-key (kbd "<C-insert>") 'ergoemacs-copy-line-or-region)
(global-set-key (kbd "C-S-v") 'ergoemacs-paste-cycle)
- [elpa] externals/ergoemacs-mode 131b3fb 62/87: Fix command-loop errors, (continued)
- [elpa] externals/ergoemacs-mode 131b3fb 62/87: Fix command-loop errors, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 2091646 65/87: Merge pull request #497 from wlandry/space_in_filenames, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode dc2f666 54/87: Add info on how to get system-wide Ergoemacs bindings in macOS, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 4a6ba06 55/87: Merge pull request #488 from marlonrichert/macos, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode aa649b2 52/87: Add hooks to ergoemacs-map-properties--modify-run-mode-hooks-excluded, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode ade132c 67/87: Remap ergoemacs-paste to calc-yank in calc-mode, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 26c2150 68/87: Merge pull request #498 from wlandry/calc_yank, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 8b437ad 70/87: Merge pull request #500 from wlandry/term_fixes, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode c7907aa 69/87: In term-mode, modify both term-raw-map and current-local-map, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode ea9b60f 71/87: Make the bash bindings work, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 72b0292 72/87: Make ergoemacs-handle-ctl-c-or-ctl-x==only-C-c-and-C-x work,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode bd805c3 80/87: More suppression of warnings, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 081fcbd 84/87: Fix #503, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode f3f7b10 42/87: Add keyboard layout; See Issue #462, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 67e8c66 60/87: Merge pull request #494 from wlandry/master, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 823b73a 32/87: Added Portuguese QWERTY keyboard layout., Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 9a5b97f 57/87: Removed commented out code, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode a5d4665 50/87: Remove emojify-emojify-mode-line mu4e-update-mail-and-index from modify, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode b61ece8 74/87: Merge remote-tracking branch 'elpa/externals/ergoemacs-mode', Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 543bc98 78/87: Silence ergoemacs-functions byte compile warnings, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode f9d6e3f 87/87: Bring over some more emacs mainatiner fixes, Stefan Monnier, 2021/04/14