Issue #1653

Move hinting functions into it.

Issue #1617

Issue #1645

(When they are above visible range, scroll up to correspond for
height reduction.)

Closes #1645

Since the addon is called merge, not diff.

Which could result in a selection at a negative character offset
when double-clicking.

Issue #1638

Issue #1084
Issue #1630

Apparenly Firefox still hasn't caught up on the unprefixed version.

Phrase-references should be able to contain interpunction characters; fixed.

Ensured that emphasis (weak & strong) plus literal syntax highlighting are rendered correctly even if the highlighted word is followed immediately by a non-word character (like an interpunction):

 * ```a word **strongly emphasised**?```;
 * ```a word *weakly emphasised*?```;
 * ```a word with ``literal emphasis``?```;

Further changed recognition order to `strong`, `weak`, `literal`, `number`, `positive`, `negative` and `link` to comply more with the reStructuredText spec (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#recognition-order).

Issue #1617

Closes #1533

... that caused certain jade files to cause brackets to hang

+ a few other fixes