diff options
| author | Fabián Ezequiel Gallina | 2014-12-27 13:16:44 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-12-27 13:16:44 -0300 |
| commit | 6e66744d4c4bd94bb7e34f4243de0213334a31c5 (patch) | |
| tree | 31e2119174abef42d4306278958c967938a5275e | |
| parent | cd1ed48ddbbb487a40bbf2ecc55ca1d8377c1819 (diff) | |
| parent | 230c010050f424cee81c3bcf00b0f00a65819dcb (diff) | |
| download | emacs-6e66744d4c4bd94bb7e34f4243de0213334a31c5.tar.gz emacs-6e66744d4c4bd94bb7e34f4243de0213334a31c5.zip | |
Merge from origin/emacs-24
230c010 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it.
Conflicts:
lisp/ChangeLog
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a13cd142780..81740630e2a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -4,6 +4,13 @@ | |||
| 4 | arg MARKER. | 4 | arg MARKER. |
| 5 | (tramp-get-remote-path): Use it. | 5 | (tramp-get-remote-path): Use it. |
| 6 | 6 | ||
| 7 | 2014-12-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 8 | 2014-12-27 Michael Albinus <michael.albinus@gmx.de> | ||
| 9 | |||
| 10 | * net/tramp-sh.el (tramp-send-command-and-read): New optional | ||
| 11 | arg MARKER. | ||
| 12 | (tramp-get-remote-path): Use it. | ||
| 13 | |||
| 7 | 2014-12-27 Michael Albinus <michael.albinus@gmx.de> | 14 | 2014-12-27 Michael Albinus <michael.albinus@gmx.de> |
| 8 | 15 | ||
| 9 | * net/tramp.el (tramp-error-with-buffer): Call `message' properly. | 16 | * net/tramp.el (tramp-error-with-buffer): Call `message' properly. |