mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit a3d72fc570ad7ece0f67bfdac1a5e701b0839b2a Author: Matthew L. Fidler <[email protected]> Date: Thu Jun 19 07:16:41 2014 -0500 Add object-set-name-string compatability with 24.4 --- ergoemacs-macros.el | 9 +++++++++ ergoemacs-theme-engine.el | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el index 2204fa9..9aacc49 100644 --- a/ergoemacs-macros.el +++ b/ergoemacs-macros.el @@ -336,6 +336,15 @@ DIFFERENCES are the differences from the layout based on the functions. These a (<= 4 emacs-minor-version)) 'eieio-object-name-string) (t 'object-name-string)) ,obj)) + +(defmacro ergoemacs-object-set-name-string (obj name) + "Compatability fixes for `object-set-name-string' or `eieio-object-set-name-string'. +" + `(,(cond + ((and (<= 24 emacs-major-version) + (<= 4 emacs-minor-version)) + 'eieio-object-set-name-string) + (t 'object-set-name-string)) ,obj ,string)) (provide 'ergoemacs-macros) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ergoemacs-macros.el ends here diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index 16d472d..d37c85b 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -210,7 +210,7 @@ a set type." (if (not (symbolp new-value)) (signal 'invalid-slot-type (list obj slot-name 'symbol new-value))) - (object-set-name-string obj (symbol-name new-value))) + (ergoemacs-object-set-name-string obj (symbol-name new-value))) (t (intern (save-match-data (replace-regexp-in-string "::.*$" "" (ergoemacs-object-name-string obj))))))) (t (call-next-method))))
