diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2007-12-23 13:25:27 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2007-12-23 13:25:27 +0000 |
| commit | adb671295c7556cd2a79333f4be5de21161df2ef (patch) | |
| tree | 65a92862c76c36351f9e31c526602469ee2d36d3 /lisp/net | |
| parent | 9f15f6766b9298c2b8c514e4b9223655b1ff77a1 (diff) | |
| download | emacs-adb671295c7556cd2a79333f4be5de21161df2ef.tar.gz | |
Sync with Tramp 2.1.12.
* net/tramp.el: New todo item.
* net/tramp-smb.el (tramp-smb-handle-insert-directory): Handle "-F"
switch. Reported by Mark T. Kennedy <mkennedy@diamondbackcap.com>.
* net/trampver.el: Update release number.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-smb.el | 14 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 706042060f6..1406f381922 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -459,7 +459,7 @@ PRESERVE-UID-GID is completely ignored." ;; We just need the only and only entry FILENAME. (list (assoc base entries))))) - ;; Sort entries + ;; Sort entries. (setq entries (sort entries @@ -470,6 +470,18 @@ PRESERVE-UID-GID is completely ignored." ;; Sort by name. (string-lessp (nth 0 x) (nth 0 y)))))) + ;; Handle "-F" switch. + (when (string-match "F" switches) + (mapcar + (lambda (x) + (when (not (zerop (length (car x)))) + (cond + ((char-equal ?d (string-to-char (nth 1 x))) + (setcar x (concat (car x) "/"))) + ((char-equal ?x (string-to-char (nth 1 x))) + (setcar x (concat (car x) "*")))))) + entries)) + ;; Print entries. (mapcar (lambda (x) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index b81c4e04f81..852a22a7034 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -7338,6 +7338,8 @@ Only works for Bourne-like shells." ;; * Reconnect directly to a compliant shell without first going ;; through the user's default shell. (Pete Forman) ;; * Make `tramp-default-user' obsolete. +;; * Tramp shall reconnect automatically to its ssh connection when it +;; detects that the process "has died". (David Reitter) ;; Functions for file-name-handler-alist: ;; diff-latest-backup-file -- in diff.el diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 0639210a1be..e390df9e9df 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -30,14 +30,14 @@ ;; "autoconf && ./configure" to change them. (X)Emacs version check is defined ;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there. -(defconst tramp-version "2.1.12-pre" +(defconst tramp-version "2.1.12" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" "Email address to send bug reports to.") ;; Check for (X)Emacs version. -(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (< emacs-minor-version 4))) (format "Tramp 2.1.12-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) +(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (< emacs-minor-version 4))) (format "Tramp 2.1.12 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) (provide 'trampver) |