]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 04:16:37 +0000 (06:16 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 04:16:37 +0000 (06:16 +0200)
commit87174f325be32b8967bb50a81ad8f43a9482f10f
treed2ab0b78ff0b7f0cc88bda43c8b4a464e877e536
parent9d72cbde8b1a6b9b391a1966fe54def9b56c9746
parent9997ec56be8bf3fb32ac246e5b654ed735ee2c52
merge from trunk
src/dispextern.h
src/xdisp.c
src/xterm.c