[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6e66744 03/10: Merge from origin/emacs-24
From: |
Fabián Ezequiel Gallina |
Subject: |
[Emacs-diffs] master 6e66744 03/10: Merge from origin/emacs-24 |
Date: |
Sat, 27 Dec 2014 18:50:38 +0000 |
branch: master
commit 6e66744d4c4bd94bb7e34f4243de0213334a31c5
Merge: cd1ed48 230c010
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>
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
---
lisp/ChangeLog | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a13cd14..8174063 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,13 @@
arg MARKER.
(tramp-get-remote-path): Use it.
+2014-12-27 Stefan Monnier <address@hidden>
+2014-12-27 Michael Albinus <address@hidden>
+
+ * net/tramp-sh.el (tramp-send-command-and-read): New optional
+ arg MARKER.
+ (tramp-get-remote-path): Use it.
+
2014-12-27 Michael Albinus <address@hidden>
* net/tramp.el (tramp-error-with-buffer): Call `message' properly.
- [Emacs-diffs] master updated (6d14e0d -> 848343f), Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master cd1ed48 02/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 6e66744 03/10: Merge from origin/emacs-24,
Fabián Ezequiel Gallina <=
- [Emacs-diffs] master c3c51ec 04/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 938d651 06/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 3a12f2e 01/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 4b72b4f 07/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master f315b69 08/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 848343f 10/10: Sanitize ChangeLog entries for previous merges., Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 411c1c6 05/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 35e1f9d 09/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27