procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression when saving tramp-default-proxies-alist (Do not merge)

Browse source 
* lisp/net/tramp.el (tramp-add-hops): Suppress `signal-hook-function'.
Save `tramp-default-proxies-alist' only when changed.
This commit is contained in:
Michael Albinus 2023-05-29 11:22:54 +02:00
parent 3f44152567
commit 53dc7bec83
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lisp/net/tramp.el
View file

@ -4624,25 +4624,29 @@ Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.")
"Add ad-hoc proxy definitions to `tramp-default-proxies-alist'." "Add ad-hoc proxy definitions to `tramp-default-proxies-alist'."
(when-let ((hops (tramp-file-name-hop vec)) (when-let ((hops (tramp-file-name-hop vec))
(item vec)) (item vec))
(dolist (proxy (reverse (split-string hops tramp-postfix-hop-regexp 'omit))) (let (signal-hook-function changed)
(let* ((host-port (tramp-file-name-host-port item)) (dolist
(user-domain (tramp-file-name-user-domain item)) (proxy (reverse (split-string hops tramp-postfix-hop-regexp 'omit)))
(proxy (concat (let* ((host-port (tramp-file-name-host-port item))
tramp-prefix-format proxy tramp-postfix-host-format)) (user-domain (tramp-file-name-user-domain item))
(entry (proxy (concat
(list (and (stringp host-port) tramp-prefix-format proxy tramp-postfix-host-format))
(tramp-compat-rx bol (literal host-port) eol)) (entry
(and (stringp user-domain) (list (and (stringp host-port)
(tramp-compat-rx bol (literal user-domain) eol)) (tramp-compat-rx bol (literal host-port) eol))
(propertize proxy 'tramp-ad-hoc t)))) (and (stringp user-domain)
(tramp-message vec 5 "Add %S to `tramp-default-proxies-alist'" entry) (tramp-compat-rx bol (literal user-domain) eol))
;; Add the hop. (propertize proxy 'tramp-ad-hoc t))))
(add-to-list 'tramp-default-proxies-alist entry) ;; Add the hop.
(setq item (tramp-dissect-file-name proxy)))) (unless (member entry tramp-default-proxies-alist)
;; Save the new value. (tramp-message vec 5 "Add %S to `tramp-default-proxies-alist'" entry)
(when tramp-save-ad-hoc-proxies (add-to-list 'tramp-default-proxies-alist entry)
(customize-save-variable (setq changed t))
'tramp-default-proxies-alist tramp-default-proxies-alist)))) (setq item (tramp-dissect-file-name proxy))))
;; Save the new value.
(when (and tramp-save-ad-hoc-proxies changed)
(customize-save-variable
'tramp-default-proxies-alist tramp-default-proxies-alist)))))
(defun tramp-compute-multi-hops (vec) (defun tramp-compute-multi-hops (vec)
"Expands VEC according to `tramp-default-proxies-alist'." "Expands VEC according to `tramp-default-proxies-alist'."