Merge from trunk.
commitaf3c30cb283811135d9a1136fa5072e6922410a9
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 07:42:55 +0000 (2 00:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 07:42:55 +0000 (2 00:42 -0700)
tree46c7ba217ef48f4951f6cb9ec8594d4169f6dfdc
parent3870d916919d4ac5d052698e7ac61a04ad0beb94
parent7d5200893a8cc980744bb4c65355df5a936388bb
Merge from trunk.
src/ChangeLog
src/minibuf.c