Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org

1 files changed, 10 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3ac401b16a3..cedd9ab8965 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix rcs2log problems with CVS.
+        Problem 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.
+        (logdir, llogdir): Work even if TMPDIR begins with '-' or has spaces.
+        (output_authors, main awk script): Parse more-recent CVS output format.
+
 2014-05-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove dependencies on getline and getdelim.