From: Glenn Morris Date: Thu, 30 Nov 2017 01:12:05 +0000 (-0800) Subject: Merge from origin/emacs-26 X-Git-Tag: emacs-27.0.90~6117 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7aedb6116ffaa6590c86e70380f533385c1ced58;p=emacs.git Merge from origin/emacs-26 02d114d6b8 * lisp/tree-widget.el (tree-widget-end-guide): Escape it. ... 0a85d12474 Fix ELisp "Warning Tips" 06d05fec84 Fix Bug#29163 ac64fdb248 Harden exec_byte_code against redefining 'error' 700f74e4c8 Fix Edebug specs for if-let* and and-let* (Bug#29236) 0ded1b41a9 Fix Edebug's handling of dotted specs (bug#6415) 16358d4fcb Improve documentation of "constant" symbols --- 7aedb6116ffaa6590c86e70380f533385c1ced58 diff --cc test/lisp/net/tramp-tests.el index efc2c578d59,2141f52cb20..8310003d9b1 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@@ -4613,9 -4604,29 +4615,29 @@@ process sentinels. They shall not dist (ignore-errors (delete-process (get-buffer-process buf))) (ignore-errors (kill-buffer buf))) (ignore-errors (cancel-timer timer)) - (ignore-errors (delete-directory tmp-name 'recursive)))))) + (ignore-errors (delete-directory tmp-name 'recursive))))))) - (ert-deftest tramp-test42-recursive-load () + (ert-deftest tramp-test42-auto-load () + "Check that Tramp autoloads properly." + (skip-unless (tramp--test-enabled)) + (skip-unless (not (tramp--test-mock-p))) + + (let ((default-directory (expand-file-name temporary-file-directory))) + (let ((code + (format + "(message \"Tramp loaded: %%s\" (consp (file-attributes \"%s\")))" + tramp-test-temporary-file-directory))) + (should + (string-match + "Tramp loaded: t[\n\r]+" + (shell-command-to-string + (format + "%s -batch -Q -L %s --eval %s" + (expand-file-name invocation-name invocation-directory) + (mapconcat 'shell-quote-argument load-path " -L ") + (shell-quote-argument code)))))))) + + (ert-deftest tramp-test43-recursive-load () "Check that Tramp does not fail due to recursive load." (skip-unless (tramp--test-enabled))