merge upstream
commitbaba9e039136e183e055169ddd7ca1e983fc734f
authorjave <joakim@verona.se>
Wed, 31 Dec 2014 11:24:10 +0000 (31 12:24 +0100)
committerjave <joakim@verona.se>
Wed, 31 Dec 2014 11:24:10 +0000 (31 12:24 +0100)
tree9168fb077980351a25ea3a112f2abd105a11099a
parent4105b6a93047045553e10795742a808b805c85b7
parent25346768fac53687c97c213fb99ff18fa805b073
merge upstream
lisp/desktop.el
lisp/vc/vc-dir.el
src/Makefile.in
src/buffer.c
src/dispextern.h
src/xdisp.c
src/xterm.c