Merge changes from emacs-23 branch

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42b4d759c0794765a68e193c7bae38c1b8eba6c0..55f0b52bb41bccbf0365182cadb0f582d889dc8a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2011-03-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * emerge.el (emerge-metachars): Separate value for ms-dos and
+       windows-nt systems.
+       (emerge-protect-metachars): Quote correctly for ms-dos and
+       windows-nt systems.
+
+2011-03-19  Ralph Schleicher  <rs@ralph-schleicher.de>
+
+       * info.el (info-initialize): Replace all uses of `:' with
+       path-separator for compatibility with non-Unix systems.
+       Cache quoting of path-separator.  (Bug#8258)
+
+2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+       * avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist)
+       (mouse-avoidance-threshold, mouse-avoidance-banish-destination)
+       (mouse-avoidance-mode): Fix typos in docstrings.
+
 2011-03-19  Chong Yidong  <cyd@stupidchicken.com>
 
        * startup.el (package-subdirectory-regexp): Move from package.el.