branch: externals/polymode
commit ee124e2fac188d9b77a5fb1cb21059254a37e65d
Author: Kien Nguyen <[email protected]>
Commit: Vitalie Spinu <[email protected]>
fix wrong usage of oset
---
polymode-export.el | 4 ++--
polymode-methods.el | 2 +-
polymode-weave.el | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/polymode-export.el b/polymode-export.el
index 18e1e7f6e3..faeca7690b 100644
--- a/polymode-export.el
+++ b/polymode-export.el
@@ -378,7 +378,7 @@ If NO-ASK-IF-1 is non-nil, don't ask if there is only one
exporter."
(setq pm--exporter-hist (delete-dups pm--exporter-hist))
(setq-local pm--export:from-last nil)
(setq-local pm--export:to-last nil)
- (oset pm/polymode 'exporter out)
+ (oset pm/polymode exporter out)
out))
(defmacro polymode-register-exporter (exporter default &rest configs)
@@ -387,7 +387,7 @@ When DEFAULT is non-nil, also make EXPORTER the default
exporter
for each polymode in CONFIGS."
`(dolist (pm ',configs)
(object-add-to-list (symbol-value pm) 'exporters ',exporter)
- (when ,default (oset (symbol-value pm) 'exporter ',exporter))))
+ (when ,default (oset (symbol-value pm) exporter ',exporter))))
;;; GLOBAL EXPORTERS
diff --git a/polymode-methods.el b/polymode-methods.el
index 2b8938bb0e..ca6bb32a63 100644
--- a/polymode-methods.el
+++ b/polymode-methods.el
@@ -63,7 +63,7 @@ Ran by the polymode mode function."
;; Set if nil! This allows unspecified host chunkmodes to be used in
;; minor modes.
(host-mode (or (eieio-oref hostmode 'mode)
- (oset hostmode 'mode major-mode))))
+ (oset hostmode mode major-mode))))
;; FIXME: mode hooks and local var hacking happens here. Need to move it
;; to the end.
(pm--mode-setup host-mode)
diff --git a/polymode-weave.el b/polymode-weave.el
index 17419f938e..37f31f4be4 100644
--- a/polymode-weave.el
+++ b/polymode-weave.el
@@ -259,7 +259,7 @@ When DEFAULT is non-nil, also make weaver the default
WEAVER for
each polymode in CONFIGS."
`(dolist (pm ',configs)
(object-add-to-list (symbol-value pm) 'weavers ',weaver)
- (when ,default (oset (symbol-value pm) 'weaver ',weaver))))
+ (when ,default (oset (symbol-value pm) weaver ',weaver))))
(defun polymode-set-weaver ()
"Set the current weaver for this polymode."
@@ -273,7 +273,7 @@ each polymode in CONFIGS."
(out (intern (cdr sel))))
(setq pm--weaver-hist (delete-dups pm--weaver-hist))
(setq-local pm--weave:fromto-last nil)
- (oset pm/polymode 'weaver out)
+ (oset pm/polymode weaver out)
out))
(provide 'polymode-weave)
