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

Fix connection-local user options handling (bug#63300)

Browse source 
* lisp/files-x.el (connection-local-set-profiles)
(connection-local-set-profile-variables): Avoid saving the changed
user option to file unless triggered explicitly by user.  (Bug#63300)
This commit is contained in:
Michael Albinus 2023-06-08 09:59:06 +02:00
parent 240803cc3e
commit a3a69ec234
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/files-x.el
View file

@ -674,15 +674,21 @@ variables for a connection profile are defined using
(dolist (profile profiles) (dolist (profile profiles)
(unless (assq profile connection-local-profile-alist) (unless (assq profile connection-local-profile-alist)
(error "No such connection profile `%s'" (symbol-name profile)))) (error "No such connection profile `%s'" (symbol-name profile))))
(let* ((criteria (connection-local-normalize-criteria criteria)) ;; Avoid saving the changed user option to file unless triggered
;; explicitly by user. This workaround can be removed once there is
;; a solution for bug#63891.
(let* ((saved-value (get 'connection-local-criteria-alist 'saved-value))
(criteria (connection-local-normalize-criteria criteria))
(slot (assoc criteria connection-local-criteria-alist))) (slot (assoc criteria connection-local-criteria-alist)))
(if slot (if slot
(setcdr slot (delete-dups (append (cdr slot) profiles))) (setcdr slot (delete-dups (append (cdr slot) profiles)))
(setq connection-local-criteria-alist (setq connection-local-criteria-alist
(cons (cons criteria (delete-dups profiles)) (cons (cons criteria (delete-dups profiles))
connection-local-criteria-alist)))) connection-local-criteria-alist)))
(custom-set-variables (custom-set-variables
`(connection-local-criteria-alist ',connection-local-criteria-alist now))) `(connection-local-criteria-alist ',connection-local-criteria-alist now))
(unless saved-value
(put 'connection-local-criteria-alist 'saved-value nil))))
(defsubst connection-local-get-profile-variables (profile) (defsubst connection-local-get-profile-variables (profile)
"Return the connection-local variable list for PROFILE." "Return the connection-local variable list for PROFILE."
@ -701,9 +707,15 @@ connection profile using `connection-local-set-profiles'. Then
variables are set in the server's process buffer according to the variables are set in the server's process buffer according to the
VARIABLES list of the connection profile. The list is processed VARIABLES list of the connection profile. The list is processed
in order." in order."
(setf (alist-get profile connection-local-profile-alist) variables) ;; Avoid saving the changed user option to file unless triggered
(custom-set-variables ;; explicitly by user. This workaround can be removed once there is
`(connection-local-profile-alist ',connection-local-profile-alist now))) ;; a solution for bug#63891.
(let ((saved-value (get 'connection-local-profile-alist 'saved-value)))
(setf (alist-get profile connection-local-profile-alist) variables)
(custom-set-variables
`(connection-local-profile-alist ',connection-local-profile-alist now))
(unless saved-value
(put 'connection-local-profile-alist 'saved-value nil))))
;;;###autoload ;;;###autoload
(defun connection-local-update-profile-variables (profile variables) (defun connection-local-update-profile-variables (profile variables)