     column = @goalColumn if @goalColumn?
     @setScreenPosition({row: row - rowCount, column: column})
     @goalColumn = column
+  moveCursorUp: (rowCount=1, options) ->
+    deprecate("Use Cursor::moveUp() instead. `Cursor` has been removed from these methods.")
+    @moveUp(rowCount, options)
 
   # Public: Moves the cursor down one screen row.
   moveDown: (rowCount = 1, {moveToEndOfSelection}={}) ->

      endOfLeadingWhitespace = range.end

    @setBufferPosition(endOfLeadingWhitespace) if endOfLeadingWhitespace.isGreaterThan(position)

  # Public: Moves the cursor to the end of the line.
  moveToEndOfScreenLine: ->
    @setScreenPosition([@getScreenRow(), Infinity])

  # Public: Moves the cursor to the end of the buffer line.
  moveToEndOfLine: ->
    @setBufferPosition([@getBufferRow(), Infinity])

  # Public: Moves the cursor to the beginning of the word.
  moveToBeginningOfWord: ->
    @setBufferPosition(@getBeginningOfCurrentWordBufferPosition())

  # Public: Moves the cursor to the end of the word.
  moveToEndOfWord: ->
    if position = @getEndOfCurrentWordBufferPosition()
      @setBufferPosition(position)

  # Public: Moves the cursor to the beginning of the next word.
  moveToBeginningOfNextWord: ->
    if position = @getBeginningOfNextWordBufferPosition()
      @setBufferPosition(position)

  # Public: Moves the cursor to the previous word boundary.
  moveToPreviousWordBoundary: ->
    if position = @getPreviousWordBoundaryBufferPosition()
      @setBufferPosition(position)

  # Public: Moves the cursor to the next word boundary.
  moveToNextWordBoundary: ->
    if position = @getMoveNextWordBoundaryBufferPosition()
      @setBufferPosition(position)

  # Public: Retrieves the buffer position of where the current word starts.
  #

    else
      { row, column } = @getScreenPosition()
      @setScreenPosition([row, column + 1], skipAtomicTokens: true, wrapBeyondNewlines: true, wrapAtSoftNewlines: true)
  moveCursorRight: (rowCount=1, options) ->
    deprecate("Use Cursor::moveRight() instead. `Cursor` has been removed from these methods.")
    @moveRight(rowCount, options)

  # Public: Moves the cursor to the top of the buffer.
  moveToTop: ->
    @setBufferPosition([0,0])
  moveCursorToTop: (rowCount=1, options) ->
    deprecate("Use Cursor::moveToTop() instead. `Cursor` has been removed from these methods.")
    @moveToTop(rowCount, options)

  # Public: Moves the cursor to the bottom of the buffer.
  moveToBottom: ->
    @setBufferPosition(@editor.getEofBufferPosition())
  moveCursorToBottom: (rowCount=1, options) ->
    deprecate("Use Cursor::moveToBottom() instead. `Cursor` has been removed from these methods.")
    @moveToBottom(rowCount, options)

  # Public: Moves the cursor to the beginning of the line.
  moveToBeginningOfScreenLine: ->
    @setScreenPosition([@getScreenRow(), 0])
  moveCursorToBeginningOfScreenLine: (rowCount=1, options) ->
    deprecate("Use Cursor::moveToBeginningOfScreenLine() instead. `Cursor` has been removed from these methods.")
    @moveToBeginningOfScreenLine(rowCount, options)

  # Public: Moves the cursor to the beginning of the buffer line.
  moveToBeginningOfLine: ->
    @setBufferPosition([@getBufferRow(), 0])
  moveCursorToBeginningOfLine: (rowCount=1, options) ->
    deprecate("Use Cursor::moveToBeginningOfLine() instead. `Cursor` has been removed from these methods.")
    @moveToBeginningOfLine(rowCount, options)

  # Public: Moves the cursor to the beginning of the first character in the
  # line.
