emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/objed 333a9d5 120/216: Fix not loading mc variable if m


From: Stefan Monnier
Subject: [elpa] externals/objed 333a9d5 120/216: Fix not loading mc variable if mc is loaded late
Date: Tue, 8 Jan 2019 12:29:23 -0500 (EST)

branch: externals/objed
commit 333a9d5fdb945bb41d899b298bda297d8563c372
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>

    Fix not loading mc variable if mc is loaded late
---
 objed.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/objed.el b/objed.el
index 8eadf52..28fdaf2 100644
--- a/objed.el
+++ b/objed.el
@@ -450,7 +450,7 @@ To avoid loading `avy' set this var before activating 
`objed-mode.'"
 (defvar which-key--using-top-level nil)
 (defvar avy-all-windows nil)
 (defvar avy-action nil)
-(defvar mc/cursor-specific-vars nil)
+
 
 (declare-function objed--exit-objed "objed" nil t)
 (declare-function electric-pair-post-self-insert-function "ext:electric")
@@ -467,12 +467,13 @@ To avoid loading `avy' set this var before activating 
`objed-mode.'"
 ;; * Support for other libs
 
 (with-eval-after-load 'multiple-cursors-core
-  (cl-pushnew 'objed--current-obj mc/cursor-specific-vars)
-  (cl-pushnew 'objed--obj-state mc/cursor-specific-vars)
-  (cl-pushnew 'objed--object mc/cursor-specific-vars)
-  (cl-pushnew 'objed--look-around mc/cursor-specific-vars)
-  (cl-pushnew 'objed--marked-ovs mc/cursor-specific-vars)
-  (cl-pushnew 'objed--last-states mc/cursor-specific-vars))
+  (when (bound-and-true-p mc/cursor-specific-vars)
+    (push 'objed--current-obj mc/cursor-specific-vars)
+    (push 'objed--obj-state mc/cursor-specific-vars)
+    (push 'objed--object mc/cursor-specific-vars)
+    (push 'objed--look-around mc/cursor-specific-vars)
+    (push 'objed--marked-ovs mc/cursor-specific-vars)
+    (push 'objed--last-states mc/cursor-specific-vars)))
 
 
 ;; * Helper Macros



reply via email to

[Prev in Thread] Current Thread [Next in Thread]