mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 66320e50152f0f0d799ef57e43863a8c1214298b Author: Matthew L. Fidler <[email protected]> Date: Wed Jun 18 14:24:35 2014 -0500 Use :initialize #'custom-initialize-default --- ergoemacs-mode.el | 19 +++---------------- ergoemacs-theme-engine.el | 1 + ergoemacs-themes.el | 1 + 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el index 40b8cfa..98a851d 100644 --- a/ergoemacs-mode.el +++ b/ergoemacs-mode.el @@ -210,6 +210,7 @@ Valid values are: " (ergoemacs-get-layouts-doc)) :type (ergoemacs-get-layouts-type) :set 'ergoemacs-set-default + :initialize #'custom-initialize-default :group 'ergoemacs-mode) (defvar ergoemacs-cua-rect-modifier-orig cua--rectangle-modifier-key) @@ -223,6 +224,7 @@ Valid values are: (const :tag "Hyper Modifier" hyper) (const :tag "Alt Modifier" alt)) :set 'ergoemacs-set-default + :initialize #'custom-initialize-default :group 'ergoemacs-mode) (defcustom ergoemacs-repeat-movement-commands nil @@ -258,22 +260,6 @@ Valid values are: (defvar ergoemacs-unbind-keys nil) (defvar ergoemacs-read-input-keys nil) -(unless (fboundp 'make-composed-keymap) - ;; Backport `make-composed-keymap' - (defun make-composed-keymap (maps &optional parent) - "Construct a new keymap composed of MAPS and inheriting from PARENT. -When looking up a key in the returned map, the key is looked in each -keymap of MAPS in turn until a binding is found. -If no binding is found in MAPS, the lookup continues in PARENT, if non-nil. -As always with keymap inheritance, a nil binding in MAPS overrides -any corresponding binding in PARENT, but it does not override corresponding -bindings in other keymaps of MAPS. -MAPS can be a list of keymaps or a single keymap. -PARENT if non-nil should be a keymap." - `(keymap - ,@(if (keymapp maps) (list maps) maps) - ,@parent))) - (unless (featurep 'ergoemacs-theme-engine) (load "ergoemacs-theme-engine")) @@ -380,6 +366,7 @@ PARENT if non-nil should be a keymap." "Use ergoemacs menus" :type 'boolean :set 'ergoemacs-set-default + :initialize #'custom-initialize-default :group 'ergoemacs-mode) (defvar ergoemacs-modal-emulation-mode-map-alist nil diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index 29f650e..8d2b11e 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -2298,6 +2298,7 @@ Returns new keymap." (ergoemacs-get-themes-doc t)) :type `,(ergoemacs-get-themes-type t) :set 'ergoemacs-set-default + :initialize #'custom-initialize-default :group 'ergoemacs-mode)))) diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el index 029feca..424a401 100644 --- a/ergoemacs-themes.el +++ b/ergoemacs-themes.el @@ -1076,6 +1076,7 @@ (const :tag "Standard" :value nil) (symbol :tag "Other")) :set 'ergoemacs-set-default + :initialize #'custom-initialize-default :group 'ergoemacs-mode) (provide 'ergoemacs-themes)
