Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3aa2953328a953a6d6a135473c186316e241d26..a745669d75405a1c65c186ccf37cce6e3edd25e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2012-07-06  Glenn Morris  <rgm@gnu.org>
+
+       * simple.el (kill-whole-line): Doc tweak.
+
+2012-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.el (file-relative-name): Compare file names
+       case-insensitively if on MS-Windows or MS-DOS, or if
+       read-file-name-completion-ignore-case is non-nil.  Don't use
+       case-fold-search for this purpose.  (Bug#11827)
+
+2012-07-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * calendar/cal-dst.el (calendar-current-time-zone): Return
+       calendar-current-time-zone-cache if non-nil.
+
 2012-07-06  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (cvs-update): Remove old alias.