mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 254d93bf92fd62dc1faa66e104e4ceb9fb50616b Author: Matthew L. Fidler <[email protected]> Date: Wed Jun 18 10:34:46 2014 -0500 Fix defcustom --- ergoemacs-functions.el | 6 +++--- ergoemacs-mode.el | 14 ++++---------- ergoemacs-shortcuts.el | 2 +- ergoemacs-theme-engine.el | 6 +++--- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el index c792abc..4fd325b 100644 --- a/ergoemacs-functions.el +++ b/ergoemacs-functions.el @@ -59,9 +59,9 @@ (defcustom ergoemacs-handle-ctl-c-or-ctl-x 'both "Type of C-c and C-x handling for `ergoemacs-mode'" :type '(choice - (const :tag "C-c/C-x only copy/cut" 'only-copy-cut) - (const :tag "C-c/C-x only Emacs C-c and C-x" 'only-C-c-and-C-x) - (const :tag "C-c/C-x copy/paste when region active, Emacs C-c/C-x otherwise." 'both)) + (const :tag "C-c/C-x only copy/cut" only-copy-cut) + (const :tag "C-c/C-x only Emacs C-c and C-x" only-C-c-and-C-x) + (const :tag "C-c/C-x copy/paste when region active, Emacs C-c/C-x otherwise." both)) :group 'ergoemacs-mode) (defun ergoemacs-major-mode-p (value) diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el index 1b5b0ab..c5d4d52 100644 --- a/ergoemacs-mode.el +++ b/ergoemacs-mode.el @@ -212,22 +212,16 @@ Valid values are: :set 'ergoemacs-set-default :group 'ergoemacs-mode) -(defcustom ergoemacs-change-smex-meta-x t - "Changes the `smex-prompt-string' to match the `execute-extended-command'" - :type 'boolean - :set 'ergoemacs-set-default - :group 'ergoemacs-mode) - (defvar ergoemacs-cua-rect-modifier-orig cua--rectangle-modifier-key) (defcustom ergoemacs-cua-rect-modifier 'super "Change the CUA rectangle modifier to this key." :type '(choice (const :tag "Do not modify the cua-rectangle modifier" nil) - (const :tag "Meta Modifier" 'meta) - (const :tag "Super Modifier" 'super) - (const :tag "Hyper Modifier" 'hyper) - (const :tag "Alt Modifier" 'alt)) + (const :tag "Meta Modifier" meta) + (const :tag "Super Modifier" super) + (const :tag "Hyper Modifier" hyper) + (const :tag "Alt Modifier" alt)) :set 'ergoemacs-set-default :group 'ergoemacs-mode) diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el index a9d85cf..59e825f 100644 --- a/ergoemacs-shortcuts.el +++ b/ergoemacs-shortcuts.el @@ -193,7 +193,7 @@ Used to help with translation keymaps like `input-decode-map'" "Shows the function evaluated with a key." :type '(choice (const :tag "Always echo" t) - (const :tag "Echo on translations" 'on-translation) + (const :tag "Echo on translations" on-translation) (const :tag "Don't Echo")) :group 'ergoemacs-read) diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index a8b0226..418edd9 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -71,8 +71,8 @@ (list (sexp :tag "Theme Component") (choice - (const :tag "Force Off" 'off) - (const :tag "Force On" 'on) + (const :tag "Force Off" off) + (const :tag "Force On" on) (const :tag "Let theme decide" nil)))) :group 'ergoemacs-themes) @@ -82,7 +82,7 @@ :type '(repeat (string :tag "Theme Component") (choice - (const :tag "Latest Version" 'nil) + (const :tag "Latest Version" nil) (string :tag "Version"))) :group 'ergoemacs-theme)
