[nongnu] elpa/iedit 106185cd95 187/301: Merge branch 'bmag-incremental-select'

[ELPA Syncer]

branch: elpa/iedit
commit 106185cd95d90c8dfb608591e79cc85bc9847d34
Merge: d335d6842a 9d03d5d44e
Author: Victor Ren <victorhge@gmail.com>
Commit: Victor Ren <victorhge@gmail.com>

    Merge branch 'bmag-incremental-select'
---
 iedit-lib.el   | 24 +++++++++++++++---------
 iedit-tests.el | 26 +++++++++++++++++++++++++-
 iedit.el       | 36 +++++++++++++++++++++++++++++++++---
 3 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/iedit-lib.el b/iedit-lib.el
index bac0279e83..b02ef5d88d 100644
--- a/iedit-lib.el
+++ b/iedit-lib.el
@@ -3,7 +3,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2015-04-13 12:16:14 Victor Ren>
+;; Time-stamp: <2016-05-17 11:24:09 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous rectangle refactoring
 ;; Version: 0.97
@@ -235,25 +235,29 @@ Return the number of occurrences."
   (iedit-add-occurrence-overlay occurrence-exp point nil))
 
 (defun iedit-add-occurrence-overlay (occurrence-exp point forward)
-  "Create next or previous occurrence overlay for `occurrence-exp'."
+  "Create next or previous occurrence overlay for `occurrence-exp'.
+Return the start position of the new occurrence if successful."
   (or point
       (setq point (point)))
-  (let ((case-fold-search (not iedit-case-sensitive)))
+  (let ((case-fold-search (not iedit-case-sensitive))
+        (pos nil))
     (save-excursion
       (goto-char point)
       (if (not (if forward
                    (re-search-forward occurrence-exp nil t)
                  (re-search-backward occurrence-exp nil t)))
-          (message "No match")
+          (message "No more match.")
+        (setq pos (match-beginning 0))
         (if (or (iedit-find-overlay-at-point (match-beginning 0) 
'iedit-occurrence-overlay-name)
                 (iedit-find-overlay-at-point (match-end 0) 
'iedit-occurrence-overlay-name))
             (error "Conflict region"))
         (push (iedit-make-occurrence-overlay (match-beginning 0)
                                              (match-end 0))
               iedit-occurrences-overlays)
-        (message "Add one match for \"%s\"" (iedit-printable occurrence-exp))
+        (message "Add one match for \"%s\"." (iedit-printable occurrence-exp))
         (if iedit-unmatched-lines-invisible
-            (iedit-hide-unmatched-lines iedit-occurrence-context-lines))))))
+            (iedit-hide-unmatched-lines iedit-occurrence-context-lines))))
+    pos))
 
 (defun iedit-add-region-as-occurrence (beg end)
   "Add region as an occurrence.
@@ -582,7 +586,7 @@ value of `iedit-occurrence-context-lines' is used for this 
time."
   (iedit-barf-if-buffering)
   (iedit-apply-on-occurrences 'downcase-region))
 
-(defun iedit-replace-occurrences()
+(defun iedit-replace-occurrences(&optional to-string)
   "Replace occurrences with STRING.
 This function preserves case."
   (interactive "*")
@@ -592,10 +596,12 @@ This function preserves case."
          (from-string (downcase (buffer-substring-no-properties
                                  (overlay-start ov)
                                  (overlay-end ov))))
-         (to-string (read-string "Replace with: "
+         (to-string (if (not to-string)
+                      (read-string "Replace with: "
                                  nil nil
                                  from-string
-                                 nil)))
+                                 nil)
+                      to-string)))
     (iedit-apply-on-occurrences
      (lambda (beg end from-string to-string)
        (goto-char beg)
diff --git a/iedit-tests.el b/iedit-tests.el
index 6624d4bd2a..b0be63092a 100644
--- a/iedit-tests.el
+++ b/iedit-tests.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2013-06-05 14:36:42 Victor Ren>
+;; Time-stamp: <2016-05-17 11:46:10 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Version: 0.97
 ;; X-URL: http://www.emacswiki.org/emacs/Iedit
@@ -499,6 +499,30 @@ fob")))))
      (should (not (iedit-same-column)))
      (should-error (iedit-kill-rectangle)))))
 
+(ert-deftest iedit-expand-to-occurrence-test ()
+  (with-iedit-test-fixture
+   "a a
+a a a
+a a a"
+   (lambda()
+     (goto-char 5)
+     (iedit-restrict-current-line)
+     (call-interactively 'iedit-expand-down-to-occurrence)
+     (should (equal (length iedit-occurrences-overlays) 4))
+     (should (= (point) 11))
+     (call-interactively 'iedit-expand-up-to-occurrence)
+     (should (equal (length iedit-occurrences-overlays) 5))
+     (should (= (point) 3))
+     (call-interactively 'iedit-expand-up-to-occurrence)
+     (call-interactively 'iedit-expand-up-to-occurrence)
+     (should (equal (length iedit-occurrences-overlays) 6))
+     (should (= (point) 1))
+     (call-interactively 'iedit-expand-down-to-occurrence)
+     (call-interactively 'iedit-expand-down-to-occurrence)
+     (call-interactively 'iedit-expand-down-to-occurrence)
+     (should (equal (length iedit-occurrences-overlays) 8))
+     (should (= (point) 15)))))
+
 (ert-deftest iedit-kill-rectangle-test ()
   (with-iedit-test-fixture
 "foo
diff --git a/iedit.el b/iedit.el
index 7bc992f98f..b20332e838 100644
--- a/iedit.el
+++ b/iedit.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2011, 2012 Victor Ren
 
-;; Time-stamp: <2016-05-13 11:10:36 Victor Ren>
+;; Time-stamp: <2016-05-17 12:25:04 Victor Ren>
 ;; Author: Victor Ren <victorhge@gmail.com>
 ;; Keywords: occurrence region simultaneous refactoring
 ;; Version: 0.97
@@ -225,11 +225,11 @@ This is like `describe-bindings', but displays only Iedit 
keys."
                                         (key-description 
iedit-toggle-key-default)
                                         key-def)
                          :warning)
-
       (define-key global-map iedit-toggle-key-default 'iedit-mode)
       (define-key isearch-mode-map iedit-toggle-key-default 
'iedit-mode-from-isearch)
       (define-key esc-map iedit-toggle-key-default 
'iedit-execute-last-modification)
-      (define-key help-map iedit-toggle-key-default 
'iedit-mode-toggle-on-function))))
+      (define-key help-map iedit-toggle-key-default 
'iedit-mode-toggle-on-function)
+      (message "Iedit default key binding is %s" (key-description 
iedit-toggle-key-default)))))
 
 ;; Avoid to restore Iedit mode when restoring desktop
 (add-to-list 'desktop-minor-mode-handlers
@@ -245,6 +245,8 @@ This is like `describe-bindings', but displays only Iedit 
keys."
     (define-key map (kbd "M-I") 'iedit-restrict-current-line)
     (define-key map (kbd "M-{") 'iedit-expand-up-a-line)
     (define-key map (kbd "M-}") 'iedit-expand-down-a-line)
+    (define-key map (kbd "M-[") 'iedit-expand-up-to-occurrence)
+    (define-key map (kbd "M-]") 'iedit-expand-down-to-occurrence)
     (define-key map (kbd "M-G") 'iedit-apply-global-modification)
     (define-key map (kbd "M-C") 'iedit-toggle-case-sensitive)
     map)
@@ -592,6 +594,34 @@ the region back up one line."
   (iedit-expand-by-a-line 'bottom
                           (if arg -1 1)))
 
+(defun iedit-expand-down-to-occurrence ()
+  "Expand the search region downwards until reaching a new occurrence.
+If no such occurrence can be found, throw an error."
+  (interactive)
+  (iedit-expand-to-occurrence t))
+
+(defun iedit-expand-up-to-occurrence ()
+  "Expand the search region upwards until reaching a new occurrence.
+If no such occurrence can be found, throw an error."
+  (interactive)
+  (iedit-expand-to-occurrence nil))
+
+(defun iedit-expand-to-occurrence (forward)
+  "Expand to next or previous occurrence."
+  (let ((pos (iedit-add-occurrence-overlay
+                (iedit-regexp-quote (iedit-current-occurrence-string))
+                (if forward
+                    (1+ (iedit-last-occurrence))
+                  (iedit-first-occurrence))
+                forward)))
+    (when pos
+      (goto-char pos)
+      (setq iedit-mode (propertize
+                        (concat " Iedit:" (number-to-string
+                                           (length 
iedit-occurrences-overlays)))
+                        'face 'font-lock-warning-face))
+      (force-mode-line-update))))
+
 (defun iedit-restrict-region (beg end &optional inclusive)
   "Restricting Iedit mode in a region."
   (when iedit-buffering