Scroll to the current line when switching to edit mode
Decline the gap width between the editor line numbers and contents
Merge remote-tracking branch 'origin/jsd2' into jsd2