Merge branch 'master' into xwidget

1 files changed, 17 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1795f021027..acbbd3a02df 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+        'temacs -nw' should not call missing functions
+        * make-docfile.c (write_globals):
+        Declare Fframe_windows_min_size with ATTRIBUTE_CONST, too.  Sort.
+
         Less 'make' chatter for lib-src
         * Makefile.in (blessmail): Less 'make' chatter here.
 
@@ -11,6 +15,17 @@
         since GCC sometimes calls stpcpy when it sees strcpy, under
         optimization switches.
 
+2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c (sym_scope_1, operator_name, open_file):
+        * emacsclient.c (get_server_config, set_local_socket)
+        (start_daemon_and_retry_set_socket):
+        * etags.c (main, C_entries, relative_filename):
+        * pop.c (sendline):
+        * update-game-score.c (main):
+        Rewrite to avoid the need for strcat, typically by using stpcpy
+        and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
+
 2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * etags.c (analyze_regex): Rename from analyse_regex.
@@ -140,8 +155,7 @@
 
 2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix rcs2log problems with CVS.
-        Problem reported by Glenn Morris in
+        Fix rcs2log problems with CVS.  Reported by Glenn Morris in
         <http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00277.html>.
         Plus, fix some security and filename quoting problems.
         * rcs2log (logdir): Prefer mktemp if available.
@@ -3496,7 +3510,7 @@
 2004-04-17  Paul Eggert  <eggert@gnu.org>
 
         * rcs2log (Help): Clarify wording of the usage message.
-        Problem reported by Alan Mackenzie in
+        Reported by Alan Mackenzie in
         <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
 
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>