diff options
| author | Fabián Ezequiel Gallina | 2015-01-28 01:03:46 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2015-01-28 01:03:46 -0300 |
| commit | 33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4 (patch) | |
| tree | 946ccc8bdc1f41a2c4066e6fcef4bfd04a9d693a /lisp/ChangeLog | |
| parent | 85ca47671ccbffe87d6ccad17039b49d6b676d61 (diff) | |
| parent | 8ee825c35b62768e28fe825163dea90d3ab46022 (diff) | |
| download | emacs-33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4.tar.gz emacs-33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4.zip | |
Merge from origin/emacs-24
8ee825c doc/emacs/programs.texi (Custom C Indent): Fix a typo. (Bug#19647)
88ba49f Fix coding.c subscript error
3ea1b31 Prevent artist-mode from creating runaway timers (Bug#6130).
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf60d38b2a3..a693cc0bdc6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2015-01-21 Daniel Koning <dk@danielkoning.com> (tiny change) | ||
| 2 | |||
| 3 | * subr.el (posnp): Correct docstring of `posnp'. | ||
| 4 | (posn-col-row): Make it work with all mouse position objects. | ||
| 5 | * textmodes/artist.el (artist-mouse-draw-continously): Cancel | ||
| 6 | timers if an error occurs during continuous drawing. (Bug#6130) | ||
| 7 | |||
| 1 | 2015-01-20 Eli Zaretskii <eliz@gnu.org> | 8 | 2015-01-20 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * button.el (button-activate, push-button): Doc fix. (Bug#19628) | 10 | * button.el (button-activate, push-button): Doc fix. (Bug#19628) |