[nongnu] elpa/iedit 8ff86b768d 115/301: Replace "(set-mark nil)" with (setq mark-active nil)"

[ELPA Syncer]

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

    Replace "(set-mark nil)" with (setq mark-active nil)"
    (set-mark nil) breaks C-u C-SPC
---
 iedit-lib.el  | 7 +++++--
 iedit-rect.el | 5 +++--
 iedit.el      | 8 +++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/iedit-lib.el b/iedit-lib.el
index 980cd63f22..7f977c0c63 100644
--- a/iedit-lib.el
+++ b/iedit-lib.el
@@ -3,7 +3,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2012-08-28 15:45:41 Victor Ren>
+;; Time-stamp: <2012-08-31 10:42:58 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
 ;; Version: 0.97
@@ -61,7 +61,10 @@
   :group 'iedit)
 
 (defcustom iedit-transient-mark-sensitive t
-  "If no-nil, Iedit mode is sensitive to the Transient Mark mode."
+  "If no-nil, Iedit mode is sensitive to the Transient Mark mode.
+It means Iedit works as expected only when regions are
+highlighted.  If you want to use iedit without Transient Mark
+mode, set it as nil."
   :type 'boolean
   :group 'iedit)
 
diff --git a/iedit-rect.el b/iedit-rect.el
index 1a874793ab..66081e1eda 100644
--- a/iedit-rect.el
+++ b/iedit-rect.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2012-08-28 15:47:41 Victor Ren>
+;; Time-stamp: <2012-08-31 11:34:26 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
 ;; Version: 0.97
@@ -97,7 +97,8 @@ Commands:
     (if (iedit-region-active)
         (let ((beg (region-beginning))
               (end (region-end)))
-          (set-mark nil)
+          (setq mark-active nil)
+          (run-hooks 'deactivate-mark-hook)
           (iedit-rectangle-start beg end)))))
 
 (defun iedit-rectangle-start (beg end)
diff --git a/iedit.el b/iedit.el
index e12432efe0..fc3370bd12 100644
--- a/iedit.el
+++ b/iedit.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2012-08-30 17:29:05 Victor Ren>
+;; Time-stamp: <2012-08-31 11:28:00 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous refactoring
 ;; Version: 0.97
@@ -335,7 +335,8 @@ Keymap used within overlays:
             (setq beg (region-beginning))
             (setq end (region-end)))))
       (setq iedit-only-complete-symbol-local complete-symbol)
-      (set-mark nil)
+      (setq mark-active nil)
+      (run-hooks 'deactivate-mark-hook)
       (setq iedit-case-sensitive-local iedit-case-sensitive-default)
       (iedit-start occurrence beg end))))
 
@@ -446,7 +447,8 @@ the initial string globally."
   (when iedit-buffering
     (iedit-stop-buffering))
   (setq iedit-last-occurrence-local (iedit-current-occurrence-string))
-  (set-mark nil)
+  (setq mark-active nil)
+  (run-hooks 'deactivate-mark-hook)
   (iedit-show-all)
   (iedit-cleanup-occurrences-overlays beg end inclusive)
   (if iedit-unmatched-lines-invisible