Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org
authorGlenn Morris <rgm@gnu.org>
Sat, 12 Apr 2014 19:24:17 +0000 (12:24 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 12 Apr 2014 19:24:17 +0000 (12:24 -0700)
commite0af409500d5f44b34a6e8d971f0c7abe1d747fe
treeda8c3218399660418391a9bc35d955aa4ff07c73
parent3197074e49162f96a6eb33ca45fbbfddcf1ae01a
parent5121b6923beb2fb62b179b4a95b07f9feb969f3d
Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org
lisp/ChangeLog
src/ChangeLog
src/w32.c
src/xdisp.c