Mercurial > emacs
changeset 87368:8b57223acf6b
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.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sun, 23 Dec 2007 13:25:27 +0000 |
| parents | 6f4bea387022 |
| children | f8bd0c4cb446 |
| files | lisp/ChangeLog lisp/net/tramp-smb.el lisp/net/tramp.el lisp/net/trampver.el |
| diffstat | 4 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Dec 22 18:39:16 2007 +0000 +++ b/lisp/ChangeLog Sun Dec 23 13:25:27 2007 +0000 @@ -1,3 +1,14 @@ +2007-12-23 Michael Albinus <michael.albinus@gmx.de> + + 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. + 2007-12-22 Richard Stallman <rms@gnu.org> * newcomment.el (comment-region-default): Don't triple the
--- a/lisp/net/tramp-smb.el Sat Dec 22 18:39:16 2007 +0000 +++ b/lisp/net/tramp-smb.el Sun Dec 23 13:25:27 2007 +0000 @@ -459,7 +459,7 @@ ;; 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 @@ ;; 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)
--- a/lisp/net/tramp.el Sat Dec 22 18:39:16 2007 +0000 +++ b/lisp/net/tramp.el Sun Dec 23 13:25:27 2007 +0000 @@ -7338,6 +7338,8 @@ ;; * 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
--- a/lisp/net/trampver.el Sat Dec 22 18:39:16 2007 +0000 +++ b/lisp/net/trampver.el Sun Dec 23 13:25:27 2007 +0000 @@ -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)