aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus2017-11-27 13:31:53 +0100
committerMichael Albinus2017-11-27 13:31:53 +0100
commit06d05fec84ded5d48aafc8649f861884afdec0b7 (patch)
tree122f80dbbfb9ddf854071112ca1333bb022eb3d3 /lisp
parentac64fdb248d791b204cf579f878f8542ded0d067 (diff)
downloademacs-06d05fec84ded5d48aafc8649f861884afdec0b7.tar.gz
emacs-06d05fec84ded5d48aafc8649f861884afdec0b7.zip
Fix Bug#29163
* lisp/net/tramp.el (tramp-autoload-file-name-regexp): Do not use "\\'" in regexp. (Bug#29163) (top) Do not run (tramp-register-autoload-file-name-handlers) when loading tramp.el. * test/lisp/net/tramp-tests.el (tramp--test-mock-p): New defun. (tramp-test32-environment-variables-and-port-numbers) (tramp-test41-asynchronous-requests): Use it. (tramp-test42-auto-load): New test. (tramp-test43-recursive-load, tramp-test44-remote-load-path) (tramp-test45-delay-load, tramp-test46-unload): Rename.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index efd31b26be6..13277ec6f34 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1055,7 +1055,7 @@ Also see `tramp-file-name-structure'.")
1055 "\\(-\\|[^/|:]\\{2,\\}\\)" 1055 "\\(-\\|[^/|:]\\{2,\\}\\)"
1056 ;; At least one character for method. 1056 ;; At least one character for method.
1057 "[^/|:]+") 1057 "[^/|:]+")
1058 ":\\'") 1058 ":")
1059 "Regular expression matching file names handled by Tramp autoload. 1059 "Regular expression matching file names handled by Tramp autoload.
1060It must match the initial `tramp-syntax' settings. It should not 1060It must match the initial `tramp-syntax' settings. It should not
1061match file names at root of the underlying local file system, 1061match file names at root of the underlying local file system,
@@ -2323,8 +2323,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
2323 'tramp-autoload-file-name-handler)) 2323 'tramp-autoload-file-name-handler))
2324 (put 'tramp-autoload-file-name-handler 'safe-magic t))) 2324 (put 'tramp-autoload-file-name-handler 'safe-magic t)))
2325 2325
2326;;;###autoload 2326;;;###autoload (tramp-register-autoload-file-name-handlers)
2327(tramp-register-autoload-file-name-handlers)
2328 2327
2329(defun tramp-use-absolute-autoload-file-names () 2328(defun tramp-use-absolute-autoload-file-names ()
2330 "Change Tramp autoload objects to use absolute file names. 2329 "Change Tramp autoload objects to use absolute file names.