]> git.eshelyaron.com Git - emacs.git/commitdiff
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)
1  2 
src/lisp.h
src/xdisp.c

diff --cc src/lisp.h
Simple merge
diff --cc src/xdisp.c
Simple merge