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

diff --cc lisp/ChangeLog
index 26bcb7f,09d5ff4..c6b0499
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,36 -1,18 +1,46 @@@
 -2014-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 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,
 +      buffer-file-name, and buffer-file-truename any more.
 +
 +2014-04-08  Leo Liu  <sdl.web@gmail.com>
 +
 +      Use lexical-binding and require cl-lib.
 +      * net/rcirc.el (rcirc, rcirc-handler-ctcp-KEEPALIVE)
 +      (rcirc-handler-generic, rcirc-fill-paragraph)
 +      (rcirc-format-response-string, rcirc-target-buffer)
 +      (rcirc-last-line, rcirc-record-activity, rcirc-split-activity)
 +      (rcirc-activity-string, rcirc-make-trees, rcirc-cmd-ctcp)
 +      (rcirc-ctcp-sender-PING, rcirc-browse-url)
 +      (rcirc-markup-timestamp, rcirc-markup-attributes)
 +      (rcirc-markup-my-nick, rcirc-markup-urls)
 +      (rcirc-markup-bright-nicks, rcirc-markup-fill)
 +      (rcirc-check-auth-status, rcirc-handler-WALLOPS)
 +      (rcirc-handler-JOIN, rcirc-handler-PART-or-KICK)
 +      (rcirc-handler-PART, rcirc-handler-KICK, rcirc-handler-QUIT)
 +      (rcirc-handler-NICK, rcirc-handler-PING, rcirc-handler-PONG)
 +      (rcirc-handler-TOPIC, rcirc-handler-301, rcirc-handler-317)
 +      (rcirc-handler-332, rcirc-handler-333, rcirc-handler-477)
 +      (rcirc-handler-MODE, rcirc-handler-353, rcirc-handler-366)
 +      (rcirc-authenticate, rcirc-handler-INVITE, rcirc-handler-ERROR)
 +      (rcirc-handler-ctcp-VERSION, rcirc-handler-ctcp-TIME)
 +      (rcirc-handler-CTCP-response): Fix unused arguments warnings and
 +      use cl-lib.
 +
  2014-04-07  João Távora  <joaotavora@gmail.com>
  
 -      * elec-pair.el:
 -      (electric-pair--syntax-ppss): When inside comments parse from
 -      comment beginning.
 +      * elec-pair.el (electric-pair--syntax-ppss):
 +      When inside comments parse from comment beginning.
        (electric-pair--balance-info): Fix typo in comment.
        (electric-pair--in-unterminated-string-p): Delete.
        (electric-pair--unbalanced-strings-p): New function.

diff --cc lisp/help.el
Simple merge

diff --cc test/ChangeLog
index fb96906,8b9b507..c27b9b5
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,5 -1,23 +1,13 @@@
+ 2014-04-09  Glenn Morris  <rgm@gnu.org>
+ 
+       * automated/python-tests.el (python-triple-quote-pairing):
+       Enable/disable electric-pair-mode as needed.
+ 
+       * automated/electric-tests.el (electric-pair-backspace-1):
+       Replace deleted function.
+ 
  2014-04-07  João Távora  <joaotavora@gmail.com>
  
 -      * automated/electric-tests.el (define-electric-pair-test):
 -      Don't overtest.
 -      (inhibit-in-mismatched-string-inside-ruby-comments): New test.
 -      (inhibit-in-mismatched-string-inside-c-comments): New test.
 -
 -      * automated/electric-tests.el (inhibit-if-strings-mismatched):
 -      New test, change from `inhibit-only-of-next-is-mismatched'.
 -
 -2014-04-06  João Távora  <joaotavora@gmail.com>
 -
        * automated/python-tests.el (python-triple-quote-pairing): New test.
        (python-syntax-after-python-backspace): New test.