Merge from origin/emacs-24

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 801a73387d165f89de10617d08e0b7d53348e2e1..2bbe28eb16ec3529d13fcfde07dce359b3f6f76a 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * display.texi (Manipulating Buttons): Explain more about the
+       'action' property.  (Bug#19628)
+
+       * text.texi (Clickable Text): Improve indexing.  (Bug#19629)
+
 2015-01-15  Eli Zaretskii  <eliz@gnu.org>
 
        * variables.texi (Creating Buffer-Local): Improve indexing.