From: Kim F. Storm <storm@cua.dk>
Date: Fri, 24 Nov 2006 20:57:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~525
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=365bba5e7ec4629be5c2e4a936681f71c2a572f0;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a4c4001f29..330ea0a3298 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,10 @@
 2006-11-24  Lars Hansen  <larsh@soem.dk>
+
 	* net/tramp.el (tramp-default-method): Under Windows, change from
 	plink to pscp.
 	(tramp-copy-failed-regexp, tramp-action-copy-failed): Add.
-	(tramp-actions-copy-out-of-band): Add pair (tramp-copy-failed-regexp
-	tramp-action-copy-failed).
+	(tramp-actions-copy-out-of-band):
+	Add pair (tramp-copy-failed-regexp tramp-action-copy-failed).
 	(tramp-action-out-of-band): Move "Permission denied" handling to
 	tramp-action-copy-failed.
 	(tramp-do-copy-or-rename-file-out-of-band): unwind-protect killing of