aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2006-11-24 20:57:51 +0000
committerKim F. Storm2006-11-24 20:57:51 +0000
commit365bba5e7ec4629be5c2e4a936681f71c2a572f0 (patch)
treee75199bb13130f74dc83268a20e2fb87b75af22a
parent5ee699a78215c1d583e0542e90fbe2e18cfaa006 (diff)
downloademacs-365bba5e7ec4629be5c2e4a936681f71c2a572f0.tar.gz
emacs-365bba5e7ec4629be5c2e4a936681f71c2a572f0.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a4c4001f29..330ea0a3298 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,10 @@
12006-11-24 Lars Hansen <larsh@soem.dk> 12006-11-24 Lars Hansen <larsh@soem.dk>
2
2 * net/tramp.el (tramp-default-method): Under Windows, change from 3 * net/tramp.el (tramp-default-method): Under Windows, change from
3 plink to pscp. 4 plink to pscp.
4 (tramp-copy-failed-regexp, tramp-action-copy-failed): Add. 5 (tramp-copy-failed-regexp, tramp-action-copy-failed): Add.
5 (tramp-actions-copy-out-of-band): Add pair (tramp-copy-failed-regexp 6 (tramp-actions-copy-out-of-band):
6 tramp-action-copy-failed). 7 Add pair (tramp-copy-failed-regexp tramp-action-copy-failed).
7 (tramp-action-out-of-band): Move "Permission denied" handling to 8 (tramp-action-out-of-band): Move "Permission denied" handling to
8 tramp-action-copy-failed. 9 tramp-action-copy-failed.
9 (tramp-do-copy-or-rename-file-out-of-band): unwind-protect killing of 10 (tramp-do-copy-or-rename-file-out-of-band): unwind-protect killing of