Merge from mainline.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07d77bc..62dd255 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Remove the doprnt implementation, as Emacs now uses vsnprintf.
+       * emacs-lisp/find-gc.el (find-gc-source-files): Remove doprnt.c.
+
 2011-04-08  Sho Nakatani <lay.sakura@gmail.com>
 
        * doc-view.el (doc-view-fit-width-to-window)
@@ -12,6 +17,12 @@
 
 2011-04-08  Eli Zaretskii  <eliz@gnu.org>
 
+       * files.el (file-size-human-readable): Produce one digit after
+       decimal, like "ls -lh" does.
+
+       * ls-lisp.el (ls-lisp-format-file-size): Allow for 7 characters in
+       the file size representation.
+
        * simple.el (list-processes): If async subprocesses are not
        available, error out with a clear error message.
 
@@ -678,7 +689,7 @@
        (emerge-protect-metachars): Quote correctly for ms-dos and
        windows-nt systems.
 
-2011-03-19  Ralph Schleicher  <rs@ralph-schleicher.de>
+2011-03-19  Ralph Schleicher  <rs@ralph-schleicher.de>  (tiny change)
 
        * info.el (info-initialize): Replace all uses of `:' with
        path-separator for compatibility with non-Unix systems.