set font size
Merge branch 'master' into emacs24