Remove mark-multiple integration

- it caused more problems than it was solving

Fixes #9
This commit is contained in:
Magnar Sveen
2012-09-24 13:00:12 +02:00
parent d534132728
commit 241e34ef2d
9 changed files with 24 additions and 542 deletions

View File

@@ -3,14 +3,14 @@ Feature: Marking multiple parts of the buffer
Scenario: Marking next like this, cursors
When I insert "This text has the word text in it"
And I select "text"
And I press "M->"
And I press "C->"
Then I should have 2 cursors
Scenario: Marking next like this, region
Given I turn on delete-selection-mode
When I insert "This text has the word text in it"
And I select "text"
And I press "M->"
And I press "C->"
And I type "sentence"
Then I should see "This sentence has the word sentence in it"
@@ -18,39 +18,39 @@ Feature: Marking multiple parts of the buffer
Given I turn on delete-selection-mode
When I insert "Here's text, text and text"
And I select "text"
And I press "M->"
And I press "C-0 M->"
And I press "C->"
And I press "C-0 C->"
And I type "more"
Then I should see "Here's more, text and more"
Scenario: Removing last fake
When I insert "Here's text, text and text"
And I select "text"
And I press "M->"
And I press "C-- M->"
And I press "C->"
And I press "C-- C->"
Then I should have one cursor
Scenario: Removing furthest mark
Given I turn on delete-selection-mode
When I insert "Here's text, text and text"
And I select "text"
And I press "M->"
And I press "M->"
And I press "C-- M->"
And I press "C->"
And I press "C->"
And I press "C-- C->"
And I type "more"
Then I should see "Here's more, more and text"
Scenario: Marking prev like this, cursors
When I insert "This text has the word text in it"
And I select the last "text"
And I press "M-<"
And I press "C-<"
Then I should have 2 cursors
Scenario: Marking prev like this, region
Given I turn on delete-selection-mode
When I insert "This text has the word text in it"
And I select the last "text"
And I press "M-<"
And I press "C-<"
And I type "sentence"
Then I should see "This sentence has the word sentence in it"
@@ -58,25 +58,25 @@ Feature: Marking multiple parts of the buffer
Given I turn on delete-selection-mode
When I insert "Here's text, text and text"
And I select the last "text"
And I press "M-<"
And I press "C-0 M-<"
And I press "C-<"
And I press "C-0 C-<"
And I type "more"
Then I should see "Here's more, text and more"
Scenario: Removing first fake
When I insert "Here's text, text and text"
And I select the last "text"
And I press "M-<"
And I press "C-- M-<"
And I press "C-<"
And I press "C-- C-<"
Then I should have one cursor
Scenario: Removing first mark
Given I turn on delete-selection-mode
When I insert "Here's text, text and text"
And I select the last "text"
And I press "M-<"
And I press "M-<"
And I press "C-- M-<"
And I press "C-<"
And I press "C-<"
And I press "C-- C-<"
And I type "more"
Then I should see "Here's text, more and more"

View File

@@ -42,8 +42,8 @@
(search-forward needle)
(set-mark (point))
(goto-char (match-beginning 0))
(mark-all-like-this)
(mc/switch-from-mark-multiple-to-cursors)))
(mc/mark-all-like-this)
(mc/keyboard-quit)))
(When "^I copy \"\\(.+\\)\" in another program$"
(lambda (text)

View File

@@ -7,9 +7,7 @@
(add-to-list 'load-path multiple-cursors-root-path)
(add-to-list 'load-path multiple-cursors-util-path)
(add-to-list 'load-path (expand-file-name "espuds" multiple-cursors-util-path))
(add-to-list 'load-path (expand-file-name "vendor" multiple-cursors-util-path))
(require 'mark-more-like-this)
(require 'multiple-cursors)
(require 'espuds)
(require 'ert)
@@ -19,10 +17,8 @@
(Before
(multiple-cursors-mode 0)
(rectangular-region-mode 0)
(mm/clear-all)
(global-set-key (kbd "C->") 'mark-next-like-this)
(global-set-key (kbd "M->") 'mc/mark-next-like-this)
(global-set-key (kbd "M-<") 'mc/mark-previous-like-this)
(global-set-key (kbd "C->") 'mc/mark-next-like-this)
(global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
(global-set-key (kbd "M-!") 'mc/mark-all-like-this)
(global-set-key (kbd "M-#") 'mc/mark-all-in-region)
(global-set-key (kbd "H-SPC") 'set-rectangular-region-anchor)