[nongnu] elpa/iedit f36e6fcf0d 143/301: Move iedit-apply-global-modification to iedit

[ELPA Syncer]

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

    Move iedit-apply-global-modification to iedit
---
 iedit-lib.el | 9 +--------
 iedit.el     | 6 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/iedit-lib.el b/iedit-lib.el
index 0b7d7b305c..6d810d9fd3 100644
--- a/iedit-lib.el
+++ b/iedit-lib.el
@@ -3,7 +3,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2012-12-09 00:42:28 Victor Ren>
+;; Time-stamp: <2012-12-22 21:56:48 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
 ;; Version: 0.97
@@ -166,7 +166,6 @@ is not applied to other occurrences when it is true.")
     (define-key map (kbd "M-SPC") 'iedit-blank-occurrences)
     (define-key map (kbd "M-D") 'iedit-delete-occurrences)
     (define-key map (kbd "M-N") 'iedit-number-occurrences)
-    (define-key map (kbd "M-;") 'iedit-apply-global-modification)
     (define-key map (kbd "M-B") 'iedit-toggle-buffering)
     (define-key map (kbd "M-<") 'iedit-first-occurrence)
     (define-key map (kbd "M->") 'iedit-last-occurrence)
@@ -188,7 +187,6 @@ It should be set before occurrence overlay is created.")
                    (substitute-command-keys "\\[iedit-blank-occurrences]") 
":blank "
                    (substitute-command-keys "\\[iedit-delete-occurrences]") 
":delete "
                    (substitute-command-keys "\\[iedit-number-occurrences]") 
":number "
-                   (substitute-command-keys 
"\\[iedit-apply-global-modification]") ":redo "
                    (substitute-command-keys "\\[iedit-toggle-buffering]") 
":buffering "
                    (substitute-command-keys "\\[iedit-first-occurrence]") "/"
                    (substitute-command-keys "\\[iedit-last-occurrence]") 
":first/last "
@@ -645,11 +643,6 @@ modification is not going to be applied to other 
occurrences."
                 (iedit-move-conjoined-overlays occurrence))))
           (goto-char (+ (overlay-start ov) offset))))))
   (setq iedit-buffering nil)
-  ;; (setq iedit-mode (propertize
-  ;;                   (concat (if iedit-rectangle " Iedit-RECT:" " Iedit:")
-  ;;                           (number-to-string (length 
iedit-occurrences-overlays)))
-  ;;                   'face 'font-lock-warning-face))
-  ;; (force-mode-line-update)
   (message "Buffered modification applied.")
   (setq iedit-before-modification-undo-list nil))
 
diff --git a/iedit.el b/iedit.el
index d17fa4a55d..1e5adc75d8 100644
--- a/iedit.el
+++ b/iedit.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2012-12-08 23:57:42 Victor Ren>
+;; Time-stamp: <2012-12-22 21:59:17 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous refactoring
 ;; Version: 0.97
@@ -223,6 +223,7 @@ This is like `describe-bindings', but displays only Iedit 
keys."
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map iedit-occurrence-keymap-default)
     (define-key map (kbd "M-H") 'iedit-restrict-function)
+    (define-key map (kbd "M-G") 'iedit-apply-global-modification)
     (define-key map (kbd "M-C") 'iedit-toggle-case-sensitive)
     map)
   "Keymap used within overlays in Iedit mode.")
@@ -489,8 +490,7 @@ the initial string globally."
   (force-mode-line-update))
 
 (defun iedit-toggle-case-sensitive ()
-  "Toggle case-sensitive matching occurrences.
-Todo: how about region"
+  "Toggle case-sensitive matching occurrences. "
   (interactive)
   (setq iedit-case-sensitive (not iedit-case-sensitive))
   (if iedit-buffering