fix ask to save file on closing if modified
Merge pull request #1797 from diegosarmentero/master

fix ask to save file on closing if modified
Allow highlighting variable names with length of 2 or more characters
Merge branch 'issue1470-highlighting'