procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync with Tramp 2.2.9.

Browse source 
* doc/misc/trampver.texi: Update release number.

* lisp/net/trampver.el: Update release number.

* test/automated/tramp-tests.el (password-cache-expiry): Set to nil.
(tramp-test28-shell-command): Make a while loop when waiting for
process exit.
This commit is contained in:
Michael Albinus 2014-02-16 18:23:00 +01:00
parent d34a353cfd
commit dd7691b7f3
6 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/ChangeLog
View file

@ -1,5 +1,9 @@
2014-02-16 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.9.
* trampver.texi: Update release number.
* efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2.
2014-02-14 Jay Belanger <jay.p.belanger@gmail.com>

2
doc/misc/trampver.texi
View file

@ -8,7 +8,7 @@
@c In the Tramp CVS, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
@set trampver 2.2.9-pre
@set trampver 2.2.9
@c Other flags from configuration
@set instprefix /usr/local

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-02 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.9.
* net/trampver.el: Update release number.
2014-02-16 Dmitry Gutov <dgutov@yandex.ru>
* ido.el (ido-file-internal): Don't add the name of an existing

4
lisp/net/trampver.el
View file

@ -31,7 +31,7 @@
;; should be changed only there.
;;;###tramp-autoload
(defconst tramp-version "2.2.9-pre"
(defconst tramp-version "2.2.9"
"This version of Tramp.")
;;;###tramp-autoload
@ -44,7 +44,7 @@
(= emacs-major-version 21)
(>= emacs-minor-version 4)))
"ok"
(format "Tramp 2.2.9-pre is not fit for %s"
(format "Tramp 2.2.9 is not fit for %s"
(when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))

8
test/ChangeLog
View file

@ -1,3 +1,11 @@
2014-02-16 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.9.
* automated/tramp-tests.el (password-cache-expiry): Set to nil.
(tramp-test28-shell-command): Make a while loop when waiting for
process exit.
2014-02-11 Michael Albinus <michael.albinus@gmx.de>
* automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git'

13
test/automated/tramp-tests.el
View file

@ -53,7 +53,8 @@
(t (format "/ssh::%s" temporary-file-directory)))
"Temporary directory for Tramp tests.")
(setq tramp-verbose 0
(setq password-cache-expiry nil
tramp-verbose 0
tramp-message-show-message nil)
;; Disable interactive passwords in batch mode.
@ -1175,7 +1176,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(should (file-exists-p tmp-name))
(async-shell-command
(format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer))
(sit-for 1 'nodisplay)
(while (ignore-errors
(memq (process-status (get-buffer-process (current-buffer)))
'(run open)))
(sit-for 1 'nodisplay))
(should
(string-equal
(format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))
@ -1189,7 +1193,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(process-send-string
(get-buffer-process (current-buffer))
(format "%s\n" (file-name-nondirectory tmp-name)))
(sit-for 1 'nodisplay)
(while (ignore-errors
(memq (process-status (get-buffer-process (current-buffer)))
'(run open)))
(sit-for 1 'nodisplay))
(should
(string-equal
(format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))