Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri@jurta.org.
authorGlenn Morris <rgm@gnu.org>
Wed, 16 Feb 2011 08:39:19 +0000 (00:39 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 16 Feb 2011 08:39:19 +0000 (00:39 -0800)
commit8678d9e413593b0abab296551a20589745c459da
tree6ce66f613a4cccad3708e3682218d7978b97de3f
parentda5e0ce4d6e000b1bc493cb20ce0cc9ecb1ba244
parent4648b91b097ad9f3dfbd8a988846293ea5a5c78c
Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri@jurta.org.
doc/misc/ChangeLog
doc/misc/dired-x.texi
src/ChangeLog
src/xdisp.c