From 6a62e60bf2920b0790ce27dfce8afd7c9f079f80 Mon Sep 17 00:00:00 2001 From: jtamagnan Date: Wed, 27 Apr 2016 22:33:15 -0400 Subject: [PATCH] Fix issue #131 (#247) * Fix issue #131 This issue would occur because the function was recieving a raw prefix arg instead of a number. This commit fixes that. * Fix issue with previous commit, add test cases --- features/insert-letters.feature | 8 +++++++- features/insert-numbers.feature | 6 ++++++ mc-separate-operations.el | 6 ++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/features/insert-letters.feature b/features/insert-letters.feature index 7bf56a3..adec2da 100644 --- a/features/insert-letters.feature +++ b/features/insert-letters.feature @@ -16,4 +16,10 @@ Feature: Insert increasing letters Given I have cursors at "text" in "This text contains the word text thrice (text)" When I press "C-u 2 5 H-3" And I press "SPC" - Then I should see "This z text contains the word aa text thrice (ab text)" \ No newline at end of file + Then I should see "This z text contains the word aa text thrice (ab text)" + + Scenario: Three cursors, a-b-c + Given I have cursors at "text" in "This text contains the word text thrice (text)" + When I press "C-u H-3" + And I press "SPC" + Then I should see "This e text contains the word f text thrice (g text)" diff --git a/features/insert-numbers.feature b/features/insert-numbers.feature index 75f5665..59db91f 100644 --- a/features/insert-numbers.feature +++ b/features/insert-numbers.feature @@ -11,3 +11,9 @@ Feature: Insert increasing numbers When I press "C-9 H-0" And I press "SPC" Then I should see "This 9 text contains the word 10 text thrice (11 text)" + + Scenario: Three cursors, 9-10-11 + Given I have cursors at "text" in "This text contains the word text thrice (text)" + When I press "C-u H-0" + And I press "SPC" + Then I should see "This 4 text contains the word 5 text thrice (6 text)" diff --git a/mc-separate-operations.el b/mc-separate-operations.el index 29385f7..487a650 100644 --- a/mc-separate-operations.el +++ b/mc-separate-operations.el @@ -33,7 +33,8 @@ (defun mc/insert-numbers (arg) "Insert increasing numbers for each cursor, starting at 0 or ARG." (interactive "P") - (setq mc--insert-numbers-number (or arg 0)) + (setq mc--insert-numbers-number (or (and arg (prefix-numeric-value arg)) + 0)) (mc/for-each-cursor-ordered (mc/execute-command-for-fake-cursor 'mc--insert-number-and-increase cursor))) @@ -58,7 +59,8 @@ "Insert increasing letters for each cursor, starting at 0 or ARG. Where letter[0]=a letter[2]=c letter[26]=aa" (interactive "P") - (setq mc--insert-letters-number (or arg 0)) + (setq mc--insert-letters-number (or (and arg (prefix-numeric-value arg)) + 0)) (mc/for-each-cursor-ordered (mc/execute-command-for-fake-cursor 'mc--insert-letter-and-increase cursor)))