branch: externals/ergoemacs-mode
commit 1cf60418dc5c7db6dc514c04e9023fb12f6d740d
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Remove :current-version
---
ergoemacs-component.el | 2 +-
ergoemacs-macros.el | 2 --
ergoemacs-map.el | 2 +-
ergoemacs-test.el | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index a859b41..8ed6853 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -560,7 +560,7 @@ Optionally assume that CURRENT-VERSION is active"
((not (setq versions (ergoemacs-component-struct-versions comp)))
comp)
((string= "" (setq versions (ergoemacs-component-struct--closest-version
- (or current-version (ergoemacs
:current-version)) versions)))
+ current-version versions)))
comp)
(t
(ergoemacs-component-struct--lookup-hash (concat
(ergoemacs-component-struct-name comp) versions)))))))
diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 3a25d9b..4a405a3 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -691,8 +691,6 @@ When arg1 can be a property. The following properties are
supported:
((and arg1 (symbolp arg1) (eq arg1 :modifier-desc)
arg2)
`(mapconcat #'ergoemacs-key-description--modifier ,arg2 ""))
- ((and arg1 (symbolp arg1) (eq arg1 :current-version))
- `(ergoemacs-theme--get-version))
((and arg1 (symbolp arg1) (eq arg1 :current-theme))
`(or (and ergoemacs-theme (stringp ergoemacs-theme) ergoemacs-theme)
(and ergoemacs-theme (symbolp ergoemacs-theme) (symbol-name
ergoemacs-theme))
diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index ef1b514..4173525 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -125,7 +125,7 @@
When SYMBOL is a string/symbol generate a hash-key based on the symbol/string."
(or (and symbol ergoemacs-map--hashkey
(intern (format "%s-%s" symbol ergoemacs-map--hashkey)))
- (let* ((val (format "%s" (append (list ergoemacs-keyboard-layout
(ergoemacs :current-version)) (ergoemacs-theme-components))))
+ (let* ((val (format "%s" (append (list ergoemacs-keyboard-layout nil)
(ergoemacs-theme-components))))
(md5 (md5 val)))
(setq ergoemacs-map--hashkey (intern md5)))))
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index c262809..3b61c66 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -160,7 +160,7 @@ sunt in culpa qui officia deserunt mollit anim id est
laborum.")
(old-type ergoemacs-command-loop-type)
(old-paste interprogram-paste-function)
(old-cut interprogram-cut-function)
- (old-version (ergoemacs :current-version))
+ (old-version nil)
(macro
,(if (plist-get plist :macro)
`(edmacro-parse-keys ,(plist-get plist :macro) t)))
