       URI   = editor.getURI()
       @history.pushToHead editor, point, URI
 
-    @emitter.emit 'will-jump-to-history', direction
-    # @lock()
+    @lock()
 
     {URI, point} = entry
     if editor.getURI() is URI # Same pane.

      atom.workspace.open(URI, options).done (editor) =>
        editor.scrollToBufferPosition(point, center: true)
        editor.setCursorBufferPosition(point)
        # @land direction
        @emitter.emit 'did-jump-to-history', direction

  land: (direction) ->
    @unLock()
    Flasher ?= require './flasher'
    Flasher.flash() if settings.get('flashOnLand')
    @history.dump direction

  history:    null
  lastEditor: null
  locked:     false
  delayedUnLockTask: null

  subscriptions: null
  editorSubscriptions: null

  activate: ->
    History = require './history'
    LastEditor = require './last-editor'

    @subscriptions = new CompositeDisposable
    @editorSubscriptions = {}
    @history       = new History settings.get('max')

    @rowDeltaToRemember = settings.get('rowDeltaToRemember')
