]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 14:17:54 +0000 (16:17 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 14:17:54 +0000 (16:17 +0200)
commita896e4c89e06e92a53317c72b2863b84bb585d4d
treefcd5150203a9ccd5ac63bb12a0bfe3e2ea27f4d7
parent93797975c60e1f1503f998be728ccbdbe1e86ab3
parente1d0341e25d588120cc58ec9114539afaf74e572
merge from trunk
src/lisp.h
src/xdisp.c