Merge from emacs-24; up to 2012-12-29T12:57:49Z!fgallina@gnu.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8327fb03b4e3707d7b89197baad11fdcd2a2854b..9e746b25146ba7d6f296bfc1af2caaf3600f37a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-07-03  Glenn Morris  <rgm@gnu.org>
 
+       * subr.el (y-or-n-p): Handle empty prompts.  (Bug#14770)
+
        Make info-xref checks case-sensitive by default
        * info.el (Info-find-node, Info-find-in-tag-table)
        (Info-find-node-in-buffer, Info-find-node-2, Info-goto-node):