]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 06:37:00 +0000 (08:37 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 06:37:00 +0000 (08:37 +0200)
commit0d50a0024015b4198a75dc70475b351d7c98d74f
tree84351e43007d54e43de7e2dc349d7ed0f1e13224
parentce7942f31ff4f4902ef2648020f2b96047b68cda
parent2084152aee6fe88fda43ffb5fd654aeae5d12129
merge from trunk
src/dispnew.c
src/window.c
src/xdisp.c