[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/net tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs/lisp/net tramp.el |
Date: |
Wed, 26 Nov 2008 06:09:17 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 08/11/26 06:09:17
Modified files:
lisp/net : tramp.el
Log message:
* net/tramp.el (tramp-handle-write-region): Improve the check for
calling direct copy.
(tramp-find-inline-encoding): Don't raise an error but a warning,
when no inline encoding is found.
(tramp-get-remote-coding): Check for a symbol. The negative check
for a string fails, when there is an empty string.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.214&r2=1.215
Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- tramp.el 16 Nov 2008 14:14:03 -0000 1.214
+++ tramp.el 26 Nov 2008 06:09:17 -0000 1.215
@@ -40,10 +40,6 @@
;; and higher. For XEmacs 21, you need the package `fsf-compat' for
;; the `with-timeout' macro.)
;;
-;; This version might not work with pre-Emacs 21 VC unless VC is
-;; loaded before tramp.el. Could you please test this and tell me about
-;; the result? Thanks.
-;;
;; Also see the todo list at the bottom of this file.
;;
;; The current version of Tramp can be retrieved from the following URL:
@@ -4297,13 +4293,13 @@
;; `rename-file' handles direct copy and out-of-band methods.
((or (tramp-local-host-p v)
(and (tramp-method-out-of-band-p v)
- (integerp start)
- (> (- end start) tramp-copy-size-limit)))
+ (> (- (or end (point-max)) (or start (point-min)))
+ tramp-copy-size-limit)))
(rename-file tmpfile filename t))
- ;; Use inline file transfer
+ ;; Use inline file transfer.
(rem-dec
- ;; Encode tmpfile
+ ;; Encode tmpfile.
(tramp-message v 5 "Encoding region...")
(unwind-protect
(with-temp-buffer
@@ -6108,11 +6104,9 @@
(setq rem-dec (nth 2 ritem))
(setq found t)))))))
- ;; Did we find something? If not, issue an error.
+ ;; Did we find something?
(unless found
- (kill-process (tramp-get-connection-process vec))
- (tramp-error
- vec 'file-error "Couldn't find an inline transfer encoding"))
+ (tramp-message vec 2 "Couldn't find an inline transfer encoding"))
;; Set connection properties.
(tramp-message vec 5 "Using local encoding `%s'" loc-enc)
@@ -7152,7 +7146,7 @@
(let ((ret (tramp-get-local-coding vec prop)))
;; The connection property might have been cached. So we must send
;; the script - maybe.
- (when (not (stringp ret))
+ (when (and ret (symbolp ret))
(let ((name (symbol-name ret)))
(while (string-match (regexp-quote "-") name)
(setq name (replace-match "_" nil t name)))
@@ -7566,6 +7560,8 @@
;; SSH instance, would correctly be propagated to the remote process
;; automatically; possibly SSH would have to be started with
;; "-t". (Markus Triska)
+;; * Support IPv6 hostnames. Use "/[some:ip:v6:address:for:tramp]:/",
+;; which is the syntax used on web browsers. (Ãscar Fuentes)
;; Functions for file-name-handler-alist:
;; diff-latest-backup-file -- in diff.el
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp/net tramp.el,
Michael Albinus <=