From: Glenn Morris <rgm@gnu.org>
Date: Wed, 14 May 2014 17:01:29 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se
X-Git-Tag: emacs-25.0.90~2640^2~104
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4da4720dfdefbdace402201c6a5fc8017bb98aa;p=emacs.git

Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se
---

f4da4720dfdefbdace402201c6a5fc8017bb98aa
diff --cc doc/emacs/ChangeLog
index 7bcd720203f,7858c78847f..afb8782ac75
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,4 -1,9 +1,8 @@@
 -2014-05-12  Eli Zaretskii  <eliz@gnu.org>
++2014-05-14  Eli Zaretskii  <eliz@gnu.org>
+ 
 -	* mule.texi (Language Environments): Remove unused @anchor.
 -	(Bug#17479)
++	* mule.texi (Language Environments): Remove unused @anchor.  (Bug#17479)
+ 
 -2014-05-02  Eli Zaretskii  <eliz@gnu.org>
 +2014-05-04  Eli Zaretskii  <eliz@gnu.org>
  
  	* trouble.texi (Lossage, DEL Does Not Delete, Stuck Recursive)
  	(Screen Garbled, Text Garbled, After a Crash, Emergency Escape)
diff --cc lisp/ChangeLog
index 0b257444662,c4df237a668..77e8942bdcc
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,22 -1,23 +1,40 @@@
+ 2014-05-14  Stephen Berman <stephen.berman@gmx.net>
+             Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* minibuffer.el (completion-pcm--merge-try): Merge trailing / with
+ 	suffix (bug#15419).
+ 
+ 2014-05-14  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* vc/emerge.el (emerge-temp-file-prefix):
+ 	Make pointless option obsolete.
+ 	(emerge-temp-file-mode): Make non-functional option obsolete.
+ 
 -2014-05-13  Michael Albinus  <michael.albinus@gmx.de>
++2014-05-14  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* net/browse-url.el (browse-url):
+ 	Use `unhandled-file-name-directory' when setting `default-directory',
+ 	in order to circumvent stalled remote connections.  (Bug#17425)
+ 
 +2014-05-14  Glenn Morris  <rgm@gnu.org>
 +
 +	* printing.el (subst-char-in-string, make-temp-file, pr-get-symbol):
 +	Optimize on Emacs, which has the relevant functions for ages.
 +
 +2014-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* simple.el (undo-make-selective-list): Obey undo-no-redo.
 +
 +2014-05-12  Sam Steingold  <sds@gnu.org>
 +
 +	* calendar/time-date.el (seconds-to-string): New function to
 +	pretty print time delay in seconds.
 +
  2014-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 +	* mpc.el (mpc-format): Trim Date to the year.
 +	(mpc-songs-hashcons): Shorten the Date field.
 +
  	* emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled
  	into autoloading just because of a silly indirection.