[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104127: * net/ange-ftp.el (ange-ftp-
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104127: * net/ange-ftp.el (ange-ftp-binary-file-name-regexp): Set default to "". |
Date: |
Thu, 05 May 2011 12:22:14 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104127
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-05 12:22:14 +0200
message:
* net/ange-ftp.el (ange-ftp-binary-file-name-regexp): Set default to "".
(ange-ftp-write-region, ange-ftp-insert-file-contents)
(ange-ftp-copy-file-internal): Use only `ange-ftp-binary-file' for
determining of binary transfer. (Bug#7383)
modified:
lisp/ChangeLog
lisp/net/ange-ftp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-05 09:48:43 +0000
+++ b/lisp/ChangeLog 2011-05-05 10:22:14 +0000
@@ -1,5 +1,13 @@
2011-05-05 Michael Albinus <address@hidden>
+ * net/ange-ftp.el (ange-ftp-binary-file-name-regexp): Set default
+ to "".
+ (ange-ftp-write-region, ange-ftp-insert-file-contents)
+ (ange-ftp-copy-file-internal): Use only `ange-ftp-binary-file' for
+ determining of binary transfer. (Bug#7383)
+
+2011-05-05 Michael Albinus <address@hidden>
+
* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
port computation bug. (Bug#8618)
=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el 2011-03-05 21:56:00 +0000
+++ b/lisp/net/ange-ftp.el 2011-05-05 10:22:14 +0000
@@ -856,15 +856,11 @@
:type '(choice (const :tag "Default" nil)
string))
-(defcustom ange-ftp-binary-file-name-regexp
- (concat "TAGS\\'\\|\\.\\(?:"
- (eval-when-compile
- (regexp-opt '("z" "Z" "lzh" "arc" "zip" "zoo" "tar" "dvi"
- "ps" "elc" "gif" "gz" "taz" "tgz")))
- "\\|EXE\\(;[0-9]+\\)?\\|[zZ]-part-..\\)\\'")
+(defcustom ange-ftp-binary-file-name-regexp ""
"If a file matches this regexp then it is transferred in binary mode."
:group 'ange-ftp
- :type 'regexp)
+ :type 'regexp
+ :version "24.1")
(defcustom ange-ftp-gateway-host nil
"Name of host to use as gateway machine when local FTP isn't possible."
@@ -3214,11 +3210,7 @@
;; What we REALLY need here is a way to determine if the mode
;; of the transfer is irrelevant, i.e. we can use binary mode
;; regardless. Maybe a system-type to host-type lookup?
- (binary (or (ange-ftp-binary-file filename)
- (and (not (memq system-type
- '(ms-dos windows-nt)))
- (memq (ange-ftp-host-type host user)
- '(unix dumb-unix)))))
+ (binary (ange-ftp-binary-file filename))
(cmd (if append 'append 'put))
(abbr (ange-ftp-abbreviate-filename filename))
;; we need to reset `last-coding-system-used' to its
@@ -3290,9 +3282,7 @@
(user (nth 1 parsed))
(name (ange-ftp-quote-string (nth 2 parsed)))
(temp (ange-ftp-make-tmp-name host))
- (binary (or (ange-ftp-binary-file filename)
- (memq (ange-ftp-host-type host user)
- '(unix dumb-unix))))
+ (binary (ange-ftp-binary-file filename))
(abbr (ange-ftp-abbreviate-filename filename))
(coding-system-used last-coding-system-used)
size)
@@ -3674,11 +3664,7 @@
(t-name (and t-parsed (ange-ftp-quote-string (nth 2 t-parsed))))
(t-abbr (ange-ftp-abbreviate-filename newname filename))
(binary (or (ange-ftp-binary-file filename)
- (ange-ftp-binary-file newname)
- (and (memq (ange-ftp-host-type f-host f-user)
- '(unix dumb-unix))
- (memq (ange-ftp-host-type t-host t-user)
- '(unix dumb-unix)))))
+ (ange-ftp-binary-file newname)))
temp1
temp2)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104127: * net/ange-ftp.el (ange-ftp-binary-file-name-regexp): Set default to "".,
Michael Albinus <=