Merge from origin/emacs-24
commit33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:46 +0000 (28 01:03 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:46 +0000 (28 01:03 -0300)
tree946ccc8bdc1f41a2c4066e6fcef4bfd04a9d693a
parent85ca47671ccbffe87d6ccad17039b49d6b676d61
parent8ee825c35b62768e28fe825163dea90d3ab46022
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).
doc/emacs/ChangeLog
doc/emacs/programs.texi
doc/lispref/ChangeLog
doc/lispref/commands.texi
lisp/ChangeLog
lisp/subr.el
src/ChangeLog
src/coding.c