Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index ebbef39..a309811 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+2011-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * fringe.c (update_window_fringes): Remove unused variables.
+
+       * unexmacosx.c (copy_data_segment): Also copy __got section.
+       (Bug#8223)
+
+2011-03-12  Eli Zaretskii  <eliz@gnu.org>
+
+       * termcap.c [MSDOS]: Include "msdos.h.
+       (find_capability, tgetnum, tgetflag, tgetstr, tputs, tgetent):
+       Constify `char *' arguments and their references according to
+       prototypes in tparam.h.
+
+       * deps.mk (termcap.o): Depend on tparam.h and msdos.h.
+
+       * msdos.c (XMenuAddPane): 3rd argument is `const char *' now.
+       Adapt all references accordingly.
+
+       * msdos.h (XMenuAddPane): 3rd argument is `const char *' now.
+
+2011-03-11  Tom Tromey  <tromey@redhat.com>
+
+       * buffer.c (syms_of_buffer): Remove obsolete comment.
+
 2011-03-11  Eli Zaretskii  <eliz@gnu.org>
 
        * termhooks.h (encode_terminal_code): Declare prototype.