diff options
| author | Glenn Morris | 2014-11-03 16:49:37 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-11-03 16:49:37 -0500 |
| commit | 41e962982dfe424c69ed99f0bd26a6e4eb67107f (patch) | |
| tree | d7cda64bfecc7b9403459fda89b7f39a9fd8732f /lisp/ChangeLog | |
| parent | 303fd9411f21d19604306ecdbd89941bf4923201 (diff) | |
| parent | bd673cc594764572cd49bd0f10a0432006368489 (diff) | |
| download | emacs-41e962982dfe424c69ed99f0bd26a6e4eb67107f.tar.gz emacs-41e962982dfe424c69ed99f0bd26a6e4eb67107f.zip | |
Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a94725c0b56..05c8ce4d83a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2014-11-03 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a | ||
| 4 | local copy of FILENAME, when it is remote. (Bug#18751) | ||
| 5 | |||
| 6 | * net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise | ||
| 7 | an error when the command fails; the return code must indicate. | ||
| 8 | (tramp-adb-send-command-and-check): Fix docstring. | ||
| 9 | |||
| 1 | 2014-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org> | 10 | 2014-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 11 | ||
| 3 | * net/eww.el (eww-display-html): Clear `url-queue'. | 12 | * net/eww.el (eww-display-html): Clear `url-queue'. |