Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 2 Oct 2011 05:44:43 +0000 (22:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 2 Oct 2011 05:44:43 +0000 (22:44 -0700)
commitdf52aeb91d63c3f904c717fa8897e59fd9a5a557
tree0d3a471d6e44def1ba160d06b454a149a1a033b9
parent39b5db3b1bb51088830bdf2d5e50940d462573d2
parent32c1fffd728cfed8427d144bf7c622257aad859f
Merge from trunk.
src/ChangeLog
src/dired.c
src/keymap.c
src/minibuf.c