     super
     @reversed()
 
+# keymap: n
+class RepeatSearch extends SearchBase
+  @extend()
+  complete: true
+  saveCurrentSearch: false
+
+  constructor: ->
+    super
+    @input = @vimState.getSearchHistoryItem(0) ? ''
+    @replicateCurrentSearch()
+
+  reversed: ->
+    @reverse = not @initiallyReversed
+    this
+
+# keymap: N
+class RepeatSearchBackwards extends RepeatSearch
+  @extend()
+  constructor: ->
+    super
+    @reversed()
+
+# keymap: %
 OpenBrackets = ['(', '{', '[']
 CloseBrackets = [')', '}', ']']
 AnyBracket = new RegExp(OpenBrackets.concat(CloseBrackets).map(_.escapeRegExp).join("|"))
 
-# keymap: n
-class RepeatSearch extends SearchBase
-  @extend()
-  complete: true
-  dontUpdateCurrentSearch: true
-
-  constructor: ->
-    super
-    @input = @vimState.getSearchHistoryItem(0) ? ''
-    @replicateCurrentSearch()
-
-  reversed: ->
-    @reverse = not @initiallyReversed
-    this
-
-# keymap: N
-class RepeatSearchBackwards extends RepeatSearch
-  @extend()
-  constructor: ->
-    super
-    @reversed()
-
-# keymap: %
 class BracketMatchingMotion extends SearchBase
   @extend()
   inclusive: true

# keymap: *
class SearchCurrentWord extends SearchBase
  @extend()
  @keywordRegex: null
  complete: true

  constructor: ->

# -------------------------
class SearchBase extends Motion
  @extend()
  saveCurrentSearch: true
  complete: false

  constructor: ->
    super
    @reverse = @initiallyReversed = false
    @updateCurrentSearch() if @saveCurrentSearch

  reversed: =>
    @initiallyReversed = @reverse = true
