From: Fabián Ezequiel Gallina Date: Wed, 28 Jan 2015 04:03:46 +0000 (-0300) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2572^2~42 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4;p=emacs.git 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). --- 33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4 diff --cc doc/emacs/ChangeLog index b7853a7f118,d1378a34c19..329da9418f8 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,17 -1,8 +1,21 @@@ + 2015-01-21 Eli Zaretskii + + * programs.texi (Custom C Indent): Fix a typo. (Bug#19647) + -2014-12-22 Eli Zaretskii +2015-01-27 Ivan Shmakov + + * files.texi (File Archives): Document "I" for tar-new-entry. + (Bug#19274) + +2014-12-31 Paul Eggert + + 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 * buffers.texi (Kill Buffer): Improve indexing. diff --cc src/ChangeLog index 5ced4734bc9,43e56416e57..d46e34c8525 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,3 -1,17 +1,9 @@@ + 2015-01-21 Paul Eggert + + Fix coding.c subscript error + * coding.c (CODING_ISO_INVOKED_CHARSET): + Avoid undefined behavior if CODING_ISO_INVOCATION returns negative. + - 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 - - * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531). - 2015-01-17 Eli Zaretskii * xdisp.c (produce_image_glyph): Fix display of images in R2L