Merge from emacs-24; up to 2014-04-02T16:17:08Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26bcb7fd668090181f90fabc4773d260b82da2d0..c6b0499a6577e1ed19f09c8a67d05ea4d5935ac2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-09  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more
+       Module methods.  (Bug#17216)
+
+2014-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * help.el (describe-bindings): Fix buffer handling (bug#17210).
+       (describe-bindings-internal): Mark obsolete.
+
 2014-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (with-silent-modifications): Don't bind deactivate-mark,