Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf60d38b2a3e58b7e07fb14c96e8c64d4da4beb6..a693cc0bdc67dc97ebbd753c8b96aac5057dc11d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-21  Daniel Koning  <dk@danielkoning.com>  (tiny change)
+
+       * subr.el (posnp): Correct docstring of `posnp'.
+       (posn-col-row): Make it work with all mouse position objects.
+       * textmodes/artist.el (artist-mouse-draw-continously): Cancel
+       timers if an error occurs during continuous drawing.  (Bug#6130)
+
 2015-01-20  Eli Zaretskii  <eliz@gnu.org>
 
        * button.el (button-activate, push-button): Doc fix.  (Bug#19628)