[nongnu] elpa/iedit 5883f9af54 211/301: Avoid overriding user's key bindings

[ELPA Syncer]

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

    Avoid overriding user's key bindings
---
 iedit-rect.el | 12 ++++++++++--
 iedit.el      |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/iedit-rect.el b/iedit-rect.el
index 247f732540..5b4cd5f011 100644
--- a/iedit-rect.el
+++ b/iedit-rect.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-06-11 22:03:41 Victor Ren>
+;; Time-stamp: <2016-06-14 00:05:58 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
 ;; Version: 0.9.9
@@ -53,7 +53,15 @@
 
 
 ;;; Default key bindings:
-(define-key ctl-x-r-map [return] 'iedit-rectangle-mode)
+(when (null (where-is-internal 'iedit-rectangle-mode))
+  (let ((key-def (lookup-key ctl-x-r-map [return])))
+    (if key-def
+        (display-warning 'iedit (format "Iedit rect default key %S is occupied 
by %s."
+                                        (key-description [C-x r return])
+                                        key-def)
+                         :warning)
+      (define-key ctl-x-r-map [return] 'iedit-rectangle-mode)
+      (message "Iedit-rect default key binding is %s" (key-description [C-x r 
return])))))
 
 (defvar iedit-rectangle nil
   "This buffer local variable which is the rectangle geometry if
diff --git a/iedit.el b/iedit.el
index dedac44392..3d2d62e12f 100644
--- a/iedit.el
+++ b/iedit.el
@@ -219,9 +219,9 @@ This is like `describe-bindings', but displays only Iedit 
keys."
     (describe-function 'iedit-mode)))
 
 ;;; Default key bindings:
-(when iedit-toggle-key-default
+(when (and iedit-toggle-key-default (null (where-is-internal 'iedit-mode)))
   (let ((key-def (lookup-key (current-global-map) iedit-toggle-key-default)))
-    (if (and key-def (not (eq key-def 'iedit-mode)))
+    (if key-def
         (display-warning 'iedit (format "Iedit default key %S is occupied by 
%s."
                                         (key-description 
iedit-toggle-key-default)
                                         key-def)