]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 04:06:30 +0000 (06:06 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 04:06:30 +0000 (06:06 +0200)
commit9d1c69140689c3efe53e50b01fe5d7f1d020277e
tree5868aa61079828f04e103c0c65c30fdf84ce8ac1
parent5a3ec8917482d3187ab187bf0b5dc15f0fc1bb63
parent9fed97293c8bc78eef679db1ae3cab468ecc473e
merge from trunk
src/dispextern.h
src/lisp.h
src/window.c
src/xdisp.c
src/xterm.c