diff options
| author | Glenn Morris | 2014-05-14 10:01:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-14 10:01:29 -0700 |
| commit | f4da4720dfdefbdace402201c6a5fc8017bb98aa (patch) | |
| tree | ff0ad3d49398cca6c22b9061742d95fc1b0a9eae /lisp/ChangeLog | |
| parent | 6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8 (diff) | |
| parent | 34cba8e885f2ed1c0e9c805ad89b9464e0b5766a (diff) | |
| download | emacs-f4da4720dfdefbdace402201c6a5fc8017bb98aa.tar.gz emacs-f4da4720dfdefbdace402201c6a5fc8017bb98aa.zip | |
Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b257444662..77e8942bdcc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,21 @@ | |||
| 1 | 2014-05-14 Stephen Berman <stephen.berman@gmx.net> | ||
| 2 | Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 3 | |||
| 4 | * minibuffer.el (completion-pcm--merge-try): Merge trailing / with | ||
| 5 | suffix (bug#15419). | ||
| 6 | |||
| 7 | 2014-05-14 Glenn Morris <rgm@gnu.org> | ||
| 8 | |||
| 9 | * vc/emerge.el (emerge-temp-file-prefix): | ||
| 10 | Make pointless option obsolete. | ||
| 11 | (emerge-temp-file-mode): Make non-functional option obsolete. | ||
| 12 | |||
| 13 | 2014-05-14 Michael Albinus <michael.albinus@gmx.de> | ||
| 14 | |||
| 15 | * net/browse-url.el (browse-url): | ||
| 16 | Use `unhandled-file-name-directory' when setting `default-directory', | ||
| 17 | in order to circumvent stalled remote connections. (Bug#17425) | ||
| 18 | |||
| 1 | 2014-05-14 Glenn Morris <rgm@gnu.org> | 19 | 2014-05-14 Glenn Morris <rgm@gnu.org> |
| 2 | 20 | ||
| 3 | * printing.el (subst-char-in-string, make-temp-file, pr-get-symbol): | 21 | * printing.el (subst-char-in-string, make-temp-file, pr-get-symbol): |