Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.
authorGlenn Morris <rgm@gnu.org>
Sat, 4 Jun 2011 18:29:18 +0000 (11:29 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 4 Jun 2011 18:29:18 +0000 (11:29 -0700)
commit99a33b77e15b9a075024701d060d912b2fd87caf
tree945b4a4623e0acb762443c369bbabe7a0a6caa00
parent1cfbb9666bc467170fbfdd612b2c7186908e0e45
parent8b3115e7025b5091b2a7cd68f6ac3442964b59e5
Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.
src/ChangeLog
src/emacs.c
src/fringe.c