Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org

diff --cc lisp/ChangeLog
index 613108fc015e82506d22cd95680f0d4c48167799,970402ef86ed750bd8eb60e2bf763bd3f80abf17..fc83e157d1805aa856973ccdcf29af9005ed17e3
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,20 +1,25 @@@
+ 2014-03-27  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
+       special globals with font-lock-builtin-face.  (Bug#17057)
+ 
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+       Don't propertize `?' or `!' as symbol constituent when after
+       colon.  (Bug#17097)
+ 
+ 2014-03-27  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * frameset.el (frameset--restore-frame): Remove workaround for bug#14795
+       which is no longer needed and causes trouble in GTK builds (bug#17046).
+ 
+       * emacs-lisp/package-x.el (package--archive-contents-from-url):
+       Use url-insert-file-contents; package-handle-response no longer exists.
+ 
 +2014-03-26  Daniel Colascione  <dancol@dancol.org>
 +
 +      * simple.el (process-menu-mode-map): New variable.
 +      (process-menu-delete-process): New command.
 +
  2014-03-26  Juanma Barranquero  <lekktu@gmail.com>
  
        * emacs-lisp/package.el: Fix bug#16733 (again).

diff --cc lisp/frameset.el
Simple merge

diff --cc src/ChangeLog
index 10cc66aceed9b72e30a547abfeb83d2b89386d4c,0c24451c459063406f22a94957d4c4c93c4e026e..eb5db45534fbfa89a8a2a907cc02a6885fef6989
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,15 +1,23 @@@
 -2014-03-26  Paul Eggert  <eggert@penguin.cs.ucla.edu>
+ 2014-03-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * w32term.c (x_draw_image_glyph_string): Fix computation of height
+       and width of image background when it is displayed with a 'box'
+       face.  (Bug#17115)
+ 
++2014-03-27  Paul Eggert  <eggert@penguin.cs.ucla.edu>
+ 
+       More backward-compatible fix to char-equal core dump (Bug#17011).
+       * editfns.c (Fchar_equal): In unibyte buffers, assume values in
+       range 128-255 are raw bytes.  Suggested by Eli Zaretskii.
+ 
 +2014-03-27  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * image.c (init_svg_functions): When loading SVG-related libraries,
 +      free already loaded libraries if the initialization fails.
 +      (rsvg_handle_set_size_callback): Remove declaration, unused.
 +
 +2014-03-26  Paul Eggert  <eggert@cs.ucla.edu>
 +
        Fix core dump in char-equal (Bug#17011).
        * editfns.c (Fchar_equal): Do not use MAKE_CHAR_MULTIBYTE in
        unibyte buffers, as we can't tell whether the characters are

diff --cc src/w32term.c
Simple merge