Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org
authorChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 11:59:28 +0000 (19:59 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 11:59:28 +0000 (19:59 +0800)
commite18afed7d695edac870ddf55aabc85c0a95a4b5f
tree81dfa2c4b4cbc9014cb621f20eb2c5b173823a66
parentac9f0b75eb3a7fb50226cda2cfa1980c2df2b429
parentc8fb9dc689cdd9facc56d7220bdf3bb5864231f0
Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org
doc/misc/ChangeLog
doc/misc/Makefile.in
lisp/ChangeLog
src/ChangeLog
src/xdisp.c