[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 26/35: Should display the correct key now.
From: |
Matthew Fidler |
Subject: |
[elpa] 26/35: Should display the correct key now. |
Date: |
Fri, 11 Jul 2014 22:33:30 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit aa877f2a78cff001f295e0242a2884e835640a20
Author: Matthew L. Fidler <address@hidden>
Date: Thu Jul 10 08:57:13 2014 -0500
Should display the correct key now.
---
ergoemacs-shortcuts.el | 30 +++++++++++++-----------------
ergoemacs-themes.el | 5 ++++-
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 513dc03..46efa81 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -440,17 +440,11 @@ It will replace anything defined by
`ergoemacs-translation'"
next-key))
(declare-function ergoemacs-pretty-key "ergoemacs-translate.el")
-(defvar ergoemacs-alt-text
- (replace-regexp-in-string
- "[Qq]" "" (ergoemacs-pretty-key "M-q")))
+(defvar ergoemacs-alt-text "M-")
-(defvar ergoemacs-ctl-text
- (replace-regexp-in-string
- "[Qq]" "" (ergoemacs-pretty-key "C-q")))
+(defvar ergoemacs-ctl-text "C-")
-(defvar ergoemacs-alt-ctl-text
- (replace-regexp-in-string
- "[Qq]" "" (ergoemacs-pretty-key "C-q")))
+(defvar ergoemacs-alt-ctl-text "M-C-")
(defun ergoemacs-read-key-next-key-is-alt (&optional type pretty-key)
"The next key read is an Alt+ key. (or M- )"
@@ -479,14 +473,16 @@ It will replace anything defined by
`ergoemacs-translation'"
(defun ergoemacs-read-key-next-key-is-alt-ctl (&optional type pretty-key)
"The next key read is an Alt+Ctrl+ key. (or C-M- )"
(interactive)
- (when (and type pretty-key)
- (let* ((next-key (ergoemacs-translate
- (vector
- (ergoemacs-read-event nil pretty-key
ergoemacs-alt-ctl-text))))
- (key (plist-get next-key ':alt-ctl-key))
- (pretty (plist-get next-key ':alt-ctl-pretty))
- (kbd (plist-get next-key ':alt-ctl)))
- (ergoemacs-read-key-install-next-key next-key key pretty kbd))))
+ (if (or type pretty-key)
+ (when (and type pretty-key)
+ (let* ((next-key (ergoemacs-translate
+ (vector
+ (ergoemacs-read-event nil pretty-key
ergoemacs-alt-ctl-text))))
+ (key (plist-get next-key ':alt-ctl-key))
+ (pretty (plist-get next-key ':alt-ctl-pretty))
+ (kbd (plist-get next-key ':alt-ctl)))
+ (ergoemacs-read-key-install-next-key next-key key pretty kbd)))
+ (warn "This should be called from ergoemacs read key sequence only.")))
(defun ergoemacs-read-key-next-key-is-quoted (&optional type pretty-key)
"The next key read is quoted."
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index f5822a2..3214fbf 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -43,7 +43,10 @@
(ergoemacs-theme-component standard-vars ()
"Enabled/changed variables/modes"
- (setq org-CUA-compatible t
+ (setq ergoemacs-alt-text (replace-regexp-in-string "[Qq]" ""
(ergoemacs-pretty-key "M-q"))
+ ergoemacs-ctl-text (replace-regexp-in-string "[Qq]" ""
(ergoemacs-pretty-key "C-q"))
+ ergoemacs-alt-ctl-text (replace-regexp-in-string "[Qq]" ""
(ergoemacs-pretty-key "M-C-q"))
+ org-CUA-compatible t
org-support-shift-select t
set-mark-command-repeat-pop t
org-special-ctrl-a/e t
- [elpa] 17/35: Add Scroll up/down command for other window, (continued)
- [elpa] 17/35: Add Scroll up/down command for other window, Matthew Fidler, 2014/07/11
- [elpa] 09/35: Change startup messages, Matthew Fidler, 2014/07/11
- [elpa] 21/35: Add load path to batch byte compile, Matthew Fidler, 2014/07/11
- [elpa] 22/35: Fix byte compile warning, Matthew Fidler, 2014/07/11
- [elpa] 23/35: Start modal shift-select (Issue #215), Matthew Fidler, 2014/07/11
- [elpa] 24/35: Fix keys on web-page, Matthew Fidler, 2014/07/11
- [elpa] 18/35: Fix Issue #270, Matthew Fidler, 2014/07/11
- [elpa] 15/35: Misc Code Cleanup, Matthew Fidler, 2014/07/11
- [elpa] 27/35: Use pr-interface when available, Matthew Fidler, 2014/07/11
- [elpa] 25/35: Fix Issue #271, Matthew Fidler, 2014/07/11
- [elpa] 26/35: Should display the correct key now.,
Matthew Fidler <=
- [elpa] 28/35: Another attempt to fix the webpage, Matthew Fidler, 2014/07/11
- [elpa] 30/35: Delete Frame/Close Emacs for Alt+f4, Matthew Fidler, 2014/07/11
- [elpa] 29/35: Fix webpage (tested works), Matthew Fidler, 2014/07/11
- [elpa] 32/35: browse-kill-ring-mode no longer needs work-around, Matthew Fidler, 2014/07/11
- [elpa] 31/35: ergoemacs-keyboard-quit calls 【q】 when applicable, Matthew Fidler, 2014/07/11
- [elpa] 35/35: v5.14.7.2 - Removed ergoemacs-pushnew, and use add-to-list for variables that are defined with defvar (Allows work-around of calling adjoin at runtime for emacs 24.1; Thaks to Stefan Monnier for pointing this out). - Expanded ã€ESC】 to exit modes that use ã€q】 for quitting the current operation. This includes many packages like magit and browse-kill-ring. - Expanded ã€Alt+f4】 to close the current frame when it is the only frame present. - Added Recent files menu that includes Open Last Closed ã€Ctl+⇧Shift+T】. - Changed ergoemacs-mode printing to use printing package when available. The file-menu has been replaced - The default theme is now selected automatically (Issue #269) - Show goto-line as ã€Ctl+L】, although the test doesn't work (Issue #265) - Added an option to move lines up and down with ã€Alt+up】, ã€Alt+down】 like Gedit (See #266) - Changed the emacs startup messages to reflect emacs keys (#267) - Other miscellaneous cleanups and fixes, Matthew Fidler, 2014/07/11
- [elpa] 34/35: The translations will fail :(, Matthew Fidler, 2014/07/11
- [elpa] 33/35: Defined variables use add-to-list otherwise pushnew, Matthew Fidler, 2014/07/11