Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b25a921..4946fe5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-28  Leo Liu  <sdl.web@gmail.com>
+
+       * pcomplete.el (pcomplete-show-completions): Use
+       minibuffer-message to make pcomplete usable in minibuffer.
+
+       * ido.el (ido-set-matches-1): Fix 2012-09-11 change.
+
 2012-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * type-break.el: Use lexical-binding.