[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 277/287: Fix Issue #257 while maintining icicle compatability
From: |
Matthew Fidler |
Subject: |
[elpa] 277/287: Fix Issue #257 while maintining icicle compatability |
Date: |
Wed, 02 Jul 2014 14:46:39 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit c8cf4bb52b2d1d069e9a6599e08d519ea78eae86
Author: Matthew L. Fidler <address@hidden>
Date: Wed Jul 2 07:09:40 2014 -0500
Fix Issue #257 while maintining icicle compatability
---
ergoemacs-functions.el | 9 +++++++--
ergoemacs-menus.el | 2 +-
ergoemacs-themes.el | 8 ++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index c6d6aa4..66408fd 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -2198,6 +2198,12 @@ See also `ergoemacs-lookup-word-on-internet'."
(dolist (dict-url ergoemacs-all-dictionaries)
(ergoemacs-lookup-word-on-internet input-word dict-url)))
+(defun ergoemacs-apropos-user-options (regexp)
+ "Show user variables that match REGEXP."
+ (interactive (list (read-string "Apropos user options (regexp): ")))
+ (let ((apropos-do-all nil))
+ (apropos-variable regexp)))
+
(defvar ergoemacs-shortcut-keys)
(defvar ergoemacs-read-input-keys)
(defvar ergoemacs-unbind-keys)
@@ -2245,8 +2251,7 @@ See also `ergoemacs-lookup-word-on-internet'."
(let ((tmp (cdr x)))
(insert (format "*** %s: %s\n%s\n"
(nth 0 x) (symbol-value (nth 0 x))
- (substitute-command-keys "\\{tmp}")
- )))))
+ (substitute-command-keys "\\{tmp}"))))))
;; Ergoemacs Test suite
diff --git a/ergoemacs-menus.el b/ergoemacs-menus.el
index e7294a1..451933d 100644
--- a/ergoemacs-menus.el
+++ b/ergoemacs-menus.el
@@ -758,7 +758,7 @@ All other modes are assumed to be minor modes or
unimportant.
apropos-commands
:help "Find commands matching a regular expression")
(user-options menu-item "User Options..."
- apropos-user-options
+ ergoemacs-apropos-user-options
:help "Find user options matching a regular
expression")
(all-vars menu-item "All Variables..."
apropos-variable
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index e8af1f8..547a3cc 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -228,6 +228,14 @@
:full-shortcut-keymap t
(define-key helm-map (kbd "C-w") 'helm-keyboard-quit)
(define-key helm-map (kbd "C-z") nil))
+
+ ;; Compatibility with Icicle (allows the use of
+ ;; `icicle-read-string-completing' directly)
+ (when icicle-mode
+ (global-set-key [remap ergoemacs-apropos-user-options]
'apropos-user-options))
+
+ (when icicle-ido-like-mode
+ (global-set-key [remap ergoemacs-apropos-user-options]
'apropos-user-options))
(when isearch-mode-hook
:modify-map t
- [elpa] 278/287: Fix Issue #256, (continued)
- [elpa] 278/287: Fix Issue #256, Matthew Fidler, 2014/07/02
- [elpa] 279/287: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/02
- [elpa] 280/287: Merge pull request #255 from akfoss/master, Matthew Fidler, 2014/07/02
- [elpa] 146/287: dolist instaed of mapc, Matthew Fidler, 2014/07/02
- [elpa] 281/287: Make Alt+; the ergoemacs-reduction M-x, Matthew Fidler, 2014/07/02
- [elpa] 165/287: Removed ergoemacs-minibuffer-setup, different quote for emulation-mode-map-alists, Matthew Fidler, 2014/07/02
- [elpa] 271/287: Merge pull request #254 from akfoss/master, Matthew Fidler, 2014/07/02
- [elpa] 272/287: Merge pull request #252 from akfoss/master, Matthew Fidler, 2014/07/02
- [elpa] 282/287: Fix Extra Quote in Issue #255, Matthew Fidler, 2014/07/02
- [elpa] 283/287: Fix Extra Quotes in Issue #255, Matthew Fidler, 2014/07/02
- [elpa] 277/287: Fix Issue #257 while maintining icicle compatability,
Matthew Fidler <=
- [elpa] 284/287: Fix another quote issue for #255, Matthew Fidler, 2014/07/02
- [elpa] 285/287: Change to M-o, Matthew Fidler, 2014/07/02
- [elpa] 275/287: fix a typo in esperanto variable, Matthew Fidler, 2014/07/02
- [elpa] 286/287: Another issue With #255, Matthew Fidler, 2014/07/02
- [elpa] 287/287: v5.14.07 - Changed theme definitions - Allow variables to be set in theme definitions, will be changed when variable exists. - Add Esperanto Layouts (Thanks to akfoss) - Fixed many menu issues (thanks to akfoss for pointing out) - Added travis support - Fixed ergoemacs-layout-programmer-dv (Thanks to bmalhorn) - Dropped support for Emacs 23 - Dropped various themes, plan on repackaging them separately. - Added support for locate-mode in `ergoemacs-open-in-external-app` (thanks to guoci) - Added standard Norweigian QWERTY layout (Thanks to oegly) - Changed ergoemacs-style key translation to be more ubiquitous by changing substitute-command-keys and other advices, Matthew Fidler, 2014/07/02
- [elpa] 103/287: Attempt to restore last test engine and make cask use it, Matthew Fidler, 2014/07/02
- [elpa] 131/287: Be more careful in error checking for ergoemacs-rm-key, Matthew Fidler, 2014/07/02
- [elpa] 126/287: Documentation update., Matthew Fidler, 2014/07/02
- [elpa] 108/287: Removed stray saved variables, Matthew Fidler, 2014/07/02
- [elpa] 136/287: Fix Makefile to have test-dir, Matthew Fidler, 2014/07/02