From: Glenn Morris <rgm@gnu.org>
Date: Thu, 8 May 2014 07:02:08 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-05-08T06:58:46Z!rgm@gnu.org
X-Git-Tag: emacs-25.0.90~2640^2~136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aabbbc45793415e1cf41b61abb1737e296d60409;p=emacs.git

Merge from emacs-24; up to 2014-05-08T06:58:46Z!rgm@gnu.org
---

aabbbc45793415e1cf41b61abb1737e296d60409
diff --cc test/ChangeLog
index 5cb8aae8c1f,443479b099e..d033548215b
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,14 -1,15 +1,15 @@@
  2014-05-08  Glenn Morris  <rgm@gnu.org>
  
  	* automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
- 	(vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging.
+ 	(vc-bzr-test-faulty-bzr-autoloads):
+ 	Give bzr a temporary home-directory, in case the real one is missing.
  
 -2014-05-05  Dmitry Gutov  <dgutov@yandex.ru>
 +2014-05-08  Dmitry Gutov  <dgutov@yandex.ru>
  
 -	* automated/ruby-mode-tests.el
 -	(ruby-interpolation-after-dollar-sign): New test.
 +	* automated/ruby-mode-tests.el (ruby-interpolation-after-dollar-sign):
 +	New test.
  
 -2014-05-05  Glenn Morris  <rgm@gnu.org>
 +2014-05-08  Glenn Morris  <rgm@gnu.org>
  
  	* automated/help-fns.el: New file.