branch: elpa/multiple-cursors
commit e7605bbd7ca292a0361ee8c4ed96298a0f858f46
Merge: 94164f7 6339657
Author: Magnar Sveen <[email protected]>
Commit: Magnar Sveen <[email protected]>
Merge pull request #42 from purcell/cleanup
Fix byte-compilation warnings, and avoid unnecessary use of "eval"
---
multiple-cursors-core.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/multiple-cursors-core.el b/multiple-cursors-core.el
index 44c2c80..485aa20 100644
--- a/multiple-cursors-core.el
+++ b/multiple-cursors-core.el
@@ -123,12 +123,6 @@ highlights the entire width of the window."
er/history)
"A list of vars that need to be tracked on a per-cursor basis.")
-(defun mc/store-cursor-specific-var (var)
- (when (boundp var) (overlay-put o var (eval var))))
-
-(defun mc/restore-cursor-specific-var (var)
- (when (boundp var) (set var (overlay-get o var))))
-
(defun mc/store-current-state-in-overlay (o)
"Store relevant info about point and mark in the given overlay."
(overlay-put o 'point (set-marker (make-marker) (point)))
@@ -139,7 +133,8 @@ highlights the entire width of the window."
(overlay-put o 'mark-active mark-active)
(overlay-put o 'yank-undo-function yank-undo-function)
(overlay-put o 'kill-ring-yank-pointer kill-ring-yank-pointer)
- (mapc 'mc/store-cursor-specific-var mc/cursor-specific-vars)
+ (dolist (var mc/cursor-specific-vars)
+ (when (boundp var) (overlay-put o var (symbol-value var))))
o)
(defun mc/restore-state-from-overlay (o)
@@ -152,7 +147,8 @@ highlights the entire width of the window."
(setq mark-active (overlay-get o 'mark-active))
(setq yank-undo-function (overlay-get o 'yank-undo-function))
(setq kill-ring-yank-pointer (overlay-get o 'kill-ring-yank-pointer))
- (mapc 'mc/restore-cursor-specific-var mc/cursor-specific-vars))
+ (dolist (var mc/cursor-specific-vars)
+ (when (boundp var) (set var (overlay-get o var)))))
(defun mc/remove-fake-cursor (o)
"Delete overlay with state, including dependent overlays and markers."
@@ -684,4 +680,9 @@ for running commands with multiple cursors.")
(provide 'multiple-cursors-core)
+;; Local Variables:
+;; coding: utf-8
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
;;; multiple-cursors-core.el ends here
