]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 15:01:31 +0000 (17:01 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 15:01:31 +0000 (17:01 +0200)
commit2da59f810184f36b4061eb422011de057bd0588e
treeb07deba1f2ce02fb4374fe972cf496a674502c00
parent88790a579512914b5608d9756cae9bb982ce7c41
parenteeaf9bf3377b6d4b9083159726da8bb67b36cb56
merge from trunk
src/dispnew.c
src/window.c
src/xdisp.c