From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 27 Mar 2014 17:34:22 +0000 (+0100)
Subject: Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org
X-Git-Tag: emacs-25.0.90~2640^2~323
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381;p=emacs.git

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

1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381
diff --cc lisp/ChangeLog
index 613108fc015,970402ef86e..fc83e157d18
--- a/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 src/ChangeLog
index 10cc66aceed,0c24451c459..eb5db45534f
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,15 +1,23 @@@
+ 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-26  Paul Eggert  <eggert@penguin.cs.ucla.edu>
++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