diff options
| author | Michael Albinus | 2024-11-23 18:33:26 +0100 |
|---|---|---|
| committer | Michael Albinus | 2024-11-23 18:33:26 +0100 |
| commit | abcc8c717d80ddffaa68a30ff59bc71d35eb52e3 (patch) | |
| tree | 9b2fa450d6ce83938d948797f9ee23a72d75d446 | |
| parent | d4cb3b30f18f4ac2c4a2ed21a4084d2209987382 (diff) | |
| download | emacs-abcc8c717d80ddffaa68a30ff59bc71d35eb52e3.tar.gz emacs-abcc8c717d80ddffaa68a30ff59bc71d35eb52e3.zip | |
; Fix bootstrap
* lisp/net/tramp.el (tramp-initial-file-name-regexp)
(tramp-autoload-file-name-regexp): Don't use `rx' in autoloaded
objects. (Bug#74490)
| -rw-r--r-- | lisp/net/tramp.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6d384d97db6..7b14469fb55 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -1208,7 +1208,10 @@ See also `tramp-file-name-regexp'.") | |||
| 1208 | 1208 | ||
| 1209 | ;;;###autoload | 1209 | ;;;###autoload |
| 1210 | (defconst tramp-initial-file-name-regexp | 1210 | (defconst tramp-initial-file-name-regexp |
| 1211 | (rx bos "/" (+ (not (any "/:"))) ":" (* (not (any "/:"))) ":") | 1211 | ;; We shouldn't use `rx' in autoloaded objects, because we don't |
| 1212 | ;; know whether it does exist already. (Bug#74490) | ||
| 1213 | ;; (rx bos "/" (+ (not (any "/:"))) ":" (* (not (any "/:"))) ":") | ||
| 1214 | "\\`/[^/:]+:[^/:]*:" | ||
| 1212 | "Value for `tramp-file-name-regexp' for autoload. | 1215 | "Value for `tramp-file-name-regexp' for autoload. |
| 1213 | It must match the initial `tramp-syntax' settings.") | 1216 | It must match the initial `tramp-syntax' settings.") |
| 1214 | 1217 | ||
| @@ -1287,7 +1290,10 @@ Also see `tramp-file-name-structure'.") | |||
| 1287 | ;;;###autoload | 1290 | ;;;###autoload |
| 1288 | (defconst tramp-autoload-file-name-regexp | 1291 | (defconst tramp-autoload-file-name-regexp |
| 1289 | ;; The method is either "-", or at least two characters. | 1292 | ;; The method is either "-", or at least two characters. |
| 1290 | (rx bos "/" (| "-" (>= 2 (not (any "/:|")))) ":") | 1293 | ;; We shouldn't use `rx' in autoloaded objects, because we don't |
| 1294 | ;; know whether it does exist already. (Bug#74490) | ||
| 1295 | ;; (rx bos "/" (| "-" (>= 2 (not (any "/:|")))) ":") | ||
| 1296 | "\\`/\\(?:-\\|[^/:|]\\{2,\\}\\):" | ||
| 1291 | "Regular expression matching file names handled by Tramp autoload. | 1297 | "Regular expression matching file names handled by Tramp autoload. |
| 1292 | It must match the initial `tramp-syntax' settings. It should not | 1298 | It must match the initial `tramp-syntax' settings. It should not |
| 1293 | match file names at root of the underlying local file system, | 1299 | match file names at root of the underlying local file system, |