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).

diff --cc doc/emacs/ChangeLog
index b7853a7f118c6231193bbc7159c418b13bdc9d21,d1378a34c19d95499bedad18604e9e0a8851f688..329da9418f8f2021e7794dddf6532769d19497ff
--- 1/doc/emacs/ChangeLog
--- 2/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,17 -1,8 +1,21 @@@
 -2014-12-22  Eli Zaretskii  <eliz@gnu.org>
+ 2015-01-21  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * programs.texi (Custom C Indent): Fix a typo.  (Bug#19647)
+ 
 +2015-01-27  Ivan Shmakov  <ivan@siamics.net>
 +
 +      * files.texi (File Archives): Document "I" for tar-new-entry.
 +      (Bug#19274)
 +
 +2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Less 'make' chatter for Emacs doc
 +      * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
 +      (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
 +      (ENVADD, $(buildinfodir)/emacs.info, emacs.html):
 +      Use them.
 +
 +2014-12-27  Eli Zaretskii  <eliz@gnu.org>
  
        * buffers.texi (Kill Buffer): Improve indexing.
  

diff --cc doc/emacs/programs.texi
Simple merge

diff --cc doc/lispref/ChangeLog
Simple merge

diff --cc doc/lispref/commands.texi
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/ChangeLog
index 5ced4734bc9a49a53375db07d665ba3bb6d0b2f6,43e56416e578164b9e5316d2ca42fd4331658e98..d46e34c852514918187a0c7689d7b6c4b0b74dbe
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,17 +1,9 @@@
 -      Backport: correct old fix for GTK font selection
 -      * gtkutil.c (xg_get_font): Fix off-by-2 typo.
 -      Fixes: bug#3228
 -
 -2015-01-21  Jan Djärv  <jan.h.d@swipnet.se>
 -
 -        * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).
 -
+ 2015-01-21  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Fix coding.c subscript error
+       * coding.c (CODING_ISO_INVOKED_CHARSET):
+       Avoid undefined behavior if CODING_ISO_INVOCATION returns negative.
+ 
  2015-01-17  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (produce_image_glyph): Fix display of images in R2L

diff --cc src/coding.c
Simple merge