[nongnu] elpa/iedit 007a6f9c28 206/301: check if mc present

[ELPA Syncer]

branch: elpa/iedit
commit 007a6f9c281c135e09556ac68f3753117568e878
Author: Victor Ren <victorhge@gmail.com>
Commit: Victor Ren <victorhge@gmail.com>

    check if mc present
---
 iedit-lib.el  | 8 +++-----
 iedit-rect.el | 6 +++---
 iedit.el      | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/iedit-lib.el b/iedit-lib.el
index 01ebd7384a..0a699eafa7 100644
--- a/iedit-lib.el
+++ b/iedit-lib.el
@@ -3,10 +3,10 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-06-11 12:57:46 Victor Ren>
+;; Time-stamp: <2016-06-11 22:58:56 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
-;; Version: 0.97
+;; Version: 0.9.9
 ;; X-URL: http://www.emacswiki.org/emacs/Iedit
 ;; Compatibility: GNU Emacs: 22.x, 23.x, 24.x
 
@@ -580,9 +580,7 @@ value of `iedit-occurrence-context-lines' is used for this 
time."
   (iedit-barf-if-buffering)
   (iedit-apply-on-occurrences 'upcase-region))
 
-(when (featurep 'multiple-cursors-core)
-  (require 'multiple-cursors-core)
-
+(when (require 'multiple-cursors-core nil t)
   (defun iedit-switch-to-mc-mode ()
     "Switch to multiple-cursors-mode."
     (interactive "*")
diff --git a/iedit-rect.el b/iedit-rect.el
index dce6b14a72..247f732540 100644
--- a/iedit-rect.el
+++ b/iedit-rect.el
@@ -2,10 +2,10 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-06-11 12:48:13 Victor Ren>
+;; Time-stamp: <2016-06-11 22:03:41 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
-;; Version: 0.97
+;; Version: 0.9.9
 ;; X-URL: http://www.emacswiki.org/emacs/Iedit
 ;; Compatibility: GNU Emacs: 22.x, 23.x, 24.x
 
@@ -66,7 +66,7 @@ current mode is iedit-rect. Otherwise it is nil.
 ;;; Define Iedit rect mode map
 (defvar iedit-rect-keymap
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map iedit-occurrence-keymap)
+    (set-keymap-parent map iedit-occurrence-keymap-default)
     (define-key map (kbd "M-K") 'iedit-kill-rectangle)
     map)
   "Keymap used within overlays in Iedit-rect mode.")
diff --git a/iedit.el b/iedit.el
index 3d29f49e39..91d166ce78 100644
--- a/iedit.el
+++ b/iedit.el
@@ -2,10 +2,10 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-06-11 13:10:35 Victor Ren>
+;; Time-stamp: <2016-06-11 13:29:49 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous refactoring
-;; Version: 0.97
+;; Version: 0.9.9
 ;; X-URL: http://www.emacswiki.org/emacs/Iedit
 ;; Compatibility: GNU Emacs: 22.x, 23.x, 24.x