[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
- [elpa] externals/objed 655a636 090/216: Fix bug, (continued)
- [elpa] externals/objed 655a636 090/216: Fix bug, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 838094f 097/216: Working on #14, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 9f4e3cf 062/216: More face object adjustments, Stefan Monnier, 2019/01/08
- [elpa] externals/objed d15d904 089/216: Fix up forward/backward until any object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 12e3fdd 078/216: Use last command event so it can be rebound for tests, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 0aa6e84 103/216: Change some object bindings, Stefan Monnier, 2019/01/08
- [elpa] externals/objed c0a65ec 108/216: Remove redundant iblock object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed b9fe335 117/216: Improve nav for objects with leading ws, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 7961536 113/216: Adjust textblock object again, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 64ed598 130/216: Mark other instances if object command is called repeatedly, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 333a9d5 120/216: Fix not loading mc variable if mc is loaded late,
Stefan Monnier <=
- [elpa] externals/objed fe5548c 138/216: Install advices for :commands after objed is loaded, fixes #21, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 5b4bf3f 128/216: Get region command positions according to objed rules, Stefan Monnier, 2019/01/08
- [elpa] externals/objed a246088 144/216: Merge pull request #23 from gergelypolonkai/defcustom-fixes, Stefan Monnier, 2019/01/08
- [elpa] externals/objed c846b15 141/216: Init only where C-n is bound to something other than next-line, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 50c2367 155/216: Mention move objects functionality, Stefan Monnier, 2019/01/08
- [elpa] externals/objed f8af251 080/216: General cleanup, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 72053b7 109/216: Simplify macro usage again, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 9558b39 098/216: Add ace char object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 49082c7 167/216: Accept 1 as universal arg, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 185fe41 111/216: Remove unused lexical var, Stefan Monnier, 2019/01/08