fix for issue ecomba#23

and setting back original register content

features/inline_temp.feature

@@ -20,3 +20,19 @@ Feature: Inline Temp :RInlineTemp
     puts 10
 
     """
+
+  Scenario: Inline a temporary variable to two variables on the same line
+    Given I have the following code:
+    """
+    x = 5
+    y = x and z = x
+    """
+    When I go to the line and execute:
+    """
+    :RInlineTemp
+    """
+    Then I should see:
+    """
+    y = 5 and z = 5
+
+    """

plugin/refactorings/general/inlinetemp.vim

@@ -3,13 +3,15 @@
 function! InlineTemp()
   " Copy the variable under the cursor into the 'a' register
   " XXX: How do I copy into a variable so I don't pollute the registers?
+  let original_a = @a
   normal "ayiw
 
   " It takes 4 diws to get the variable, equal sign, and surrounding
   " whitespace. I'm not sure why. diw is different from dw in this
   " respect.
   normal 4diw
   " Delete the expression into the 'b' register
+  let original_b = @b
   normal "bd$
 
   " Delete the remnants of the line
@@ -21,5 +23,9 @@ function! InlineTemp()
   " Find the next occurence of the variable
   exec '/\<' . @a . '\>'
   " Replace that occurence with the text we yanked
-  exec ':.s/\<' . @a . '\>/' . @b
+  exec ':.s/\<' . @a . '\>/' . @b .'/g'
+
+  " Put bck original register contents
+  let @a = original_a
+  let @b = original_b
 endfunction