mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit c8cf4bb52b2d1d069e9a6599e08d519ea78eae86 Author: Matthew L. Fidler <[email protected]> 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
