]> git.eshelyaron.com Git - emacs.git/commitdiff
merge master
authorJoakim Verona <joakim@verona.se>
Wed, 4 Feb 2015 20:46:19 +0000 (21:46 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 4 Feb 2015 20:46:19 +0000 (21:46 +0100)
1  2 
src/dispextern.h
src/xdisp.c

Simple merge
diff --cc src/xdisp.c
Simple merge