aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2022-09-20 14:07:45 +0200
committerMichael Albinus2022-09-20 14:07:45 +0200
commitf419c507a778b87edd95983e8ea37f162ce50bf3 (patch)
tree657eb16a8c4210c254e5848cf981ca5ca9388bc7
parent32d3cf6298460b68e710420c14db3fdc882d70f8 (diff)
downloademacs-f419c507a778b87edd95983e8ea37f162ce50bf3.tar.gz
emacs-f419c507a778b87edd95983e8ea37f162ce50bf3.zip
Wrap max-specpdl-size with with-no-warnings in Tramp
* lisp/net/tramp-archive.el (max-specpdl-size): * lisp/net/tramp-gvfs.el (max-specpdl-size): Wrap with `with-no-warnings'.
-rw-r--r--lisp/net/tramp-archive.el9
-rw-r--r--lisp/net/tramp-gvfs.el3
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index 9ff5d6ac75d..b343e460df6 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -112,8 +112,10 @@
112(eval-when-compile (require 'cl-lib)) 112(eval-when-compile (require 'cl-lib))
113;; Sometimes, compilation fails with "Variable binding depth exceeds 113;; Sometimes, compilation fails with "Variable binding depth exceeds
114;; max-specpdl-size". Shall be fixed in Emacs 27. 114;; max-specpdl-size". Shall be fixed in Emacs 27.
115(eval-and-compile 115(with-no-warnings ;; max-specpdl-size
116 (let ((max-specpdl-size (* 2 max-specpdl-size))) (require 'tramp-gvfs))) 116 (eval-and-compile
117 (let ((max-specpdl-size (* 2 max-specpdl-size)))
118 (require 'tramp-gvfs))))
117 119
118(autoload 'dired-uncache "dired") 120(autoload 'dired-uncache "dired")
119(autoload 'url-tramp-convert-url-to-tramp "url-tramp") 121(autoload 'url-tramp-convert-url-to-tramp "url-tramp")
@@ -343,6 +345,7 @@ arguments to pass to the OPERATION."
343 (tramp-register-file-name-handlers) 345 (tramp-register-file-name-handlers)
344 (tramp-archive-run-real-handler operation args)) 346 (tramp-archive-run-real-handler operation args))
345 347
348 (with-no-warnings ;; max-specpdl-size
346 (let* ((filename (apply #'tramp-archive-file-name-for-operation 349 (let* ((filename (apply #'tramp-archive-file-name-for-operation
347 operation args)) 350 operation args))
348 (archive (tramp-archive-file-name-archive filename)) 351 (archive (tramp-archive-file-name-archive filename))
@@ -376,7 +379,7 @@ arguments to pass to the OPERATION."
376 (setq args (cons operation args))) 379 (setq args (cons operation args)))
377 (if fn 380 (if fn
378 (save-match-data (apply (cdr fn) args)) 381 (save-match-data (apply (cdr fn) args))
379 (tramp-archive-run-real-handler operation args))))))) 382 (tramp-archive-run-real-handler operation args))))))))
380 383
381;;;###autoload 384;;;###autoload
382(progn (defun tramp-archive-autoload-file-name-handler (operation &rest args) 385(progn (defun tramp-archive-autoload-file-name-handler (operation &rest args)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index cf23676b0c2..477f8fb3fdd 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -2505,6 +2505,7 @@ This uses \"avahi-browse\" in case D-Bus is not enabled in Avahi."
2505 result)))) 2505 result))))
2506 2506
2507(when tramp-gvfs-enabled 2507(when tramp-gvfs-enabled
2508 (with-no-warnings ;; max-specpdl-size
2508 ;; Suppress D-Bus error messages and Tramp traces. 2509 ;; Suppress D-Bus error messages and Tramp traces.
2509 (let (;; Sometimes, it fails with "Variable binding depth exceeds 2510 (let (;; Sometimes, it fails with "Variable binding depth exceeds
2510 ;; max-specpdl-size". Shall be fixed in Emacs 27. 2511 ;; max-specpdl-size". Shall be fixed in Emacs 27.
@@ -2562,7 +2563,7 @@ This uses \"avahi-browse\" in case D-Bus is not enabled in Avahi."
2562 "mtp" 2563 "mtp"
2563 (mapcar 2564 (mapcar
2564 (lambda (method) `(tramp-parse-media-names ,(format "_%s._tcp" method))) 2565 (lambda (method) `(tramp-parse-media-names ,(format "_%s._tcp" method)))
2565 tramp-media-methods)))) 2566 tramp-media-methods)))))
2566 2567
2567(add-hook 'tramp-unload-hook 2568(add-hook 'tramp-unload-hook
2568 (lambda () 2569 (lambda ()