Merge changes from emacs-23 branch

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f19b02..2353116 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,72 @@
+2011-01-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead
+       of int.  All uses adjusted.
+       (PNG_JMPBUF, png_load, jpeg_load, tiff_load, gif_load)
+       (svg_load_image): Remove casts.
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+       * image.c (fn_png_longjmp, fn_png_set_longjmp_fn): New png
+       function definitions for compiling with libpng-1.5.
+       (PNG_LONGJMP, PNG_JMPBUF): New macros for libpng-1.5.
+       (my_png_error, png_load): Use them.  Suggested by Thomas Klausner
+       (Bug#7908).
+
+2011-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+       * s/ms-w32.h (HAVE_STRFTIME): Don't define.
+
+       * makefile.w32-in (OBJ2): Remove strftime.$(O).
+       ($(BLD)/strftime.$(O)): Remove prerequisites.
+
+2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+       src/emacs.c now gets version number from configure.in
+       * emacs.c (emacs_version): Set to VERSION so that it
+       is determined automatically from ../configure.in.
+
+2011-01-31  Jim Meyering  <meyering@redhat.com>
+
+       * charset.c (load_charset_map): Don't deref NULL on failed malloc.
+       Use xmalloc rather than malloc.
+
+2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       strftime: import from gnulib
+       * Makefile.in (obj): Remove strftime.o, as gnulib now does this for us.
+       * deps.mk (strftime.o): Remove.
+       * editfns.c: Include <strftime.h>, supplied by gnulib.
+       (emacs_strftimeu): Remove decl.
+       (emacs_memftimeu): Use nstrftime (the gnulib name) rather than
+       emacs_strftimeu.
+       * config.in: Regenerate.
+       * strftime.c: Remove; we now use strftime from gnulib.
+
+       Use SSDATA when the context wants char *.
+       * alloc.c, buffer.c, bytecode.c, callproc.c, dired.c:
+       * dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c:
+       * fns.c, font.c, frame.c, image.c, indent.c, keyboard.c:
+       * lread.c, minibuf.c, print.c, process.c, search.c, widget.c:
+       * xdisp.c, xfaces.c, xfns.c, xml.c, xselect.c, xterm.c:
+       Use SSDATA (not SDATA) when the context of the expression wants
+       char * (not unsigned char *).
+
+2011-01-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * .gdbinit: Read global lisp variables as globals.f_V*.
+
+2011-01-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * font.c (PROP_MATCH): Remove parameter N and use strlen instead.
+       All uses changed.
+       (PROP_SAVE): Likewise.
+
+2011-01-29  Chong Yidong  <cyd@stupidchicken.com>
+
+       * keyboard.c (make_lispy_position): Fix typo in last change
+       (Bug#7935).
+
 2011-01-29  Eli Zaretskii  <eliz@gnu.org>
 
        * s/ms-w32.h (HAVE_MKTIME): Remove.