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

diff --cc doc/emacs/ChangeLog
index 7bcd720203fc097637e6a587690f604d8f2aeacc,7858c78847ff019a260ff97c6d70b48beceb5971..afb8782ac7549427ca5a92ec6fef97590a09d179
--- 1/doc/emacs/ChangeLog
--- 2/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 0b25744466261ff7c9425a776fae441b3836050e,c4df237a66843d7f10510f5ddc6e3258b6f0ff78..77e8942bdccc350d1498778b39a0a9702069fffa
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,22 -1,23 +1,40 @@@
 -2014-05-13  Michael Albinus  <michael.albinus@gmx.de>
+ 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-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.
  

diff --cc lisp/minibuffer.el
Simple merge