Merge from trunk

1 files changed, 139 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 079941811c0..1b6a16dd524 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,141 @@
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (get_current_dir_name, w32_get_resource)
+        (w32_getenv, w32_set_user_model_id, w32_window_app, w32_execvp)
+        (close_winsock, initialize_sockets, w32_find_emacs_process)
+        (w32_give_focus):
+        * ntlib.c (getlogin, getuid, getgid, getegid):
+        Convert definitions to standard C.
+
+2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
+        (PROFILING_LDFLAGS): Set from substitution.
+        (BASE_CFLAGS): Add  ${C_WARNINGS_SWITCH}.
+        (ALL_CFLAGS, CPP_CFLAGS): Add ${PROFILING_CFLAGS}.
+        (LINK_CFLAGS): Add ${PROFILING_LDFLAGS}.
+
+2010-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (lisp2): Change hebrew.el to hebrew.elc (see
+        2010-07-12T05:25:46Z!handa@etlken).
+
+2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacsclient.c (set_local_socket): Use strchr, strrchr instead of
+        index, rindex.
+        * movemail.c (mail_spool_name, popmail): Likewise.
+        * pop.c (pop_list): Likewise.
+
+2010-07-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscribe.o,
+        and unexw32.o.  (Bug#6603)
+
+2010-07-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}): Convert spaces to TABs.
+
+2010-07-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (write_c_args): Restructure scanning loop.
+
+2010-07-09  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * make-docfile.c (write_c_args): Deal with type names in DEFUN
+        arguments.
+
+2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * update-game-score.c (P_): Remove macro.
+        * ebrowse.c: Remove include guards.
+        (P_): Remove macro.
+
+2010-07-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by
+        memcpy, memmove, memset.
+        * pop.c (pop_retrieve, socket_connection, pop_getline): Likewise.
+
+2010-07-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * movemail.c: Add MAIL_USE_POP around prototypes.
+        Include <string.h> if HAVE_STRING_H.
+        (strerror): Only declare if !HAVE_STRERROR.
+        (fatal): Make static.
+        (error): Likewise.
+        (pfatal_with_name): Likewise.
+        (pfatal_and_delete). Likewise.
+        (concat): Likewise.
+        (xmalloc): Likewise.
+        (popmail): Likewise.
+        (pop_retr): Likewise.
+        (mbx_write): Likewise.
+        (mbx_delimit_begin): Likewise.
+        (mbx_delimit_end): Likewise.
+
+2010-07-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * fakemail.c (action): Convert function definitions to standard C.
+        (add_a_stream):
+        * test-distrib.c (cool_read):
+        (main): Likewise.
+
+2010-07-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * sorted-doc.c (cmpdoc): Fix signature.
+        (qsort_compare): Delete.
+        (main): Remove cast.
+
+2010-07-03  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ebrowse.c (match_qualified_namespace_alias): Check for null pointer.
+
+2010-07-03  Juanma Barranquero  <lekktu@gmail.com>
+
+        Fix prototype warnings.
+
+        * ebrowse.c (match_qualified_namespace_alias):
+        Pass sym* to find_namespace, not link*.
+
+        * emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET.
+
+        * sorted-doc.c (qsort_compare): New typedef.
+        (main): Use it to cast cmpdoc.
+
+2010-07-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * update-game-score.c: Convert function definitions to standard C.
+        * sorted-doc.c:
+        * profile.c:
+        * pop.c:
+        * movemail.c:
+        * make-docfile.c:
+        * hexl.c:
+        * fakemail.c:
+        * etags.c:
+        * ebrowse.c:
+        * digest-doc.c:
+        * b2m.c: Likewise.
+
+2010-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * make-docfile.c (xmalloc, xrealloc, concat, readline, fatal):
+        * b2m.c (scan_file, scan_lisp_file, scan_c_file): Convert to
+        standard C prototypes.
+
+2010-07-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * ebrowse.c: Remove P_ and __P.
+        * etags.c:
+        * movemail.c:
+        * pop.c:
+        * update-game-score.c: Likewise.
+
+2010-06-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * movemail.c (error): Avoid warning when there are no args.
+
 2010-06-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
@@ -143,8 +281,7 @@
 
 2010-01-29  Kester Habermann  <kester@linuxtag.org>  (tiny change)
 
-        * etags.c (Fortran_functions): Handle recursive keyword
-        (Bug#5484).
+        * etags.c (Fortran_functions): Handle recursive keyword (Bug#5484).
 
 2010-01-11  Glenn Morris  <rgm@gnu.org>