Merge from origin/emacs-24

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ff1f8148e8159c247731f4c5fd6046a93e3b3114..a546306f9e4287805b445d618109faf8df349411 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-23  Eli Zaretskii  <eliz@gnu.org>
+
+       * commands.texi (Event Input Misc): Fix incorrect usage of @code.
+       (Bug#20174)
+       (Accessing Mouse): Expand documentation of 'posn-actual-col-row'.
+       (Bug#20169)
+       More accurate description of 'posn-object-x-y'.  (Bug#20168)
+
 2015-03-23  Daiki Ueno  <ueno@gnu.org>
 
        * processes.texi (Asynchronous Processes): Mention `make-process'.