Merge from mainline.

1 files changed, 21 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c942f9c52ca..392510c63d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,26 @@
+2011-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * net/rcirc.el (rcirc-send-ctcp): Remove spurious arg to `format'.
+
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * server.el (server-process-filter): Use pcase.
+
+        * emacs-lisp/smie.el (smie-blink-matching-open): Don't use `pos' in two
+        conflicting ways.
+        (smie-indent--parent): Extend to "parent of arg".
+        (smie-indent-inside-string): New function.
+        (smie-indent-functions): Use it.
+
+        * vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid
+        bzr locking race condition.
+
+        * emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
+        still valid before using it.
+
+        * progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to
+        `message' -> `compilation-message' rename (bug#8004).
+
         Move keymap initialization into declaration.
         * textmodes/enriched.el (enriched-mode-map):
         * textmodes/bib-mode.el (bib-mode-map):