summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTianxiang Xiong <tianxiang.xiong@gmail.com>2017-12-17 18:32:32 -0800
committerBozhidar Batsov <bozhidar.batsov@gmail.com>2017-12-18 07:36:27 +0000
commit35e6d966cbf61ba35386f82efc32398a867d400f (patch)
tree49df9bf2232c9183f8b98dff2ee69fdaf104678d
parentb7c93fec984658b83f6ffb4ccc9f13ce1b54e418 (diff)
Use `non-essential` instead of `tramp-completion-mode` for Emacs 26
`tramp-completion-mode` is deprecated in Emacs 26. See: https://travis-ci.org/clojure-emacs/cider/jobs/317868996#L820
-rw-r--r--cider.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/cider.el b/cider.el
index 9f07042a..5dab445d 100644
--- a/cider.el
+++ b/cider.el
@@ -706,7 +706,10 @@ gets associated with it."
(defun cider--ssh-hosts ()
"Retrieve all ssh host from local configuration files."
(seq-map (lambda (s) (list (replace-regexp-in-string ":$" "" s)))
- (let ((tramp-completion-mode t))
+ ;; `tramp-completion-mode' is obsoleted in 26
+ (cl-progv (if (version< emacs-version "26")
+ '(tramp-completion-mode)
+ '(non-essential)) '(t)
(tramp-completion-handle-file-name-all-completions "" "/ssh:"))))
(defun cider--completing-read-host (hosts)