Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.
authorGlenn Morris <rgm@gnu.org>
Wed, 25 May 2011 03:45:04 +0000 (20:45 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 25 May 2011 03:45:04 +0000 (20:45 -0700)
commitb9345dfd4b5479ec624f1870723a8ea5c9c719e7
treeffe98c92f47b03463683ce41a1046d7dda5b13ca
parente949074338d3f5ccc7475721c7421eef6aea68d4
parente61124cd850ad6e0fc511dc995031db77b3535cd
Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.
src/ChangeLog
src/dispextern.h
src/dispnew.c
src/fringe.c
src/xdisp.c