[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 582962a: ; Remove unwanted merge from emacs-25
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 582962a: ; Remove unwanted merge from emacs-25 |
Date: |
Tue, 22 Mar 2016 19:37:15 +0000 |
branch: master
commit 582962a3a184135047c5809b1172691a1c5f2586
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
; Remove unwanted merge from emacs-25
---
test/lisp/net/tramp-tests.el | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index d9563ec..a29e42e 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1785,14 +1785,6 @@ Several special characters do not work properly there."
(file-truename tramp-test-temporary-file-directory) nil
(string-match "^HP-UX" (tramp-get-connection-property v "uname" ""))))
-(defun tramp--test-darwin-p ()
- "Check, whether the remote host runs Mac OS X.
-Several special characters do not work properly there."
- ;; We must refill the cache. `file-truename' does it.
- (with-parsed-tramp-file-name
- (file-truename tramp-test-temporary-file-directory) nil
- (string-match "^Darwin" (tramp-get-connection-property v "uname" ""))))
-
(defun tramp--test-check-files (&rest files)
"Run a simple but comprehensive test over every file in FILES."
;; We must use `file-truename' for the temporary directory, because
@@ -2046,10 +2038,9 @@ Use the `ls' command."
(file-name-coding-system 'utf-8))
(tramp--test-check-files
(unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ")
- (unless (or (tramp--test-hpux-p) (tramp--test-darwin-p))
+ (unless (tramp--test-hpux-p)
"أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها
بلا اتصال بالإنترنت")
- (unless (tramp--test-darwin-p)
- "银河系漫游指南系列")
+ "银河系漫游指南系列"
"Автостопом по гала́ктике")))
(ert-deftest tramp-test32-utf8 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 582962a: ; Remove unwanted merge from emacs-25,
Michael Albinus <=