Merge branch 'master' into switch

Author: bbatsov

.travis.yml

@@ -1,28 +1,54 @@
 sudo: false
 language: emacs-lisp
+
+addons:
+  apt:
+    packages:
+    - autogen
+    - ca-certificates
+    - curl
+    - gcc
+    - libgmp-dev
+    - m4
+    - make
+    - pkg-config
+    - xz-utils
+
+cache:
+  directories:
+  - $HOME/local
+
 env:
-  - EMACS_BINARY=emacs-24.4-travis MAKE_TEST=test
-  - EMACS_BINARY=emacs-24.4-travis MAKE_TEST=test-bytecomp
-  - EMACS_BINARY=emacs-24.5-travis MAKE_TEST=test
-  - EMACS_BINARY=emacs-24.5-travis MAKE_TEST=test-bytecomp
-  - EMACS_BINARY=emacs-25.1-travis MAKE_TEST=test
-  - EMACS_BINARY=emacs-25.1-travis MAKE_TEST=test-bytecomp
-  - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test
-  - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test-bytecomp
-  - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test-checks
-  - EMACS_BINARY=emacs-git-snapshot-travis MAKE_TEST=test
-  - EMACS_BINARY=emacs-git-snapshot-travis MAKE_TEST=test-bytecomp
-  - EMACS_BINARY=emacs-git-snapshot-travis MAKE_TEST=test-checks
+  global:
+    - PATH=$HOME/local/bin:$PATH
+  matrix:
+    - EMACS_BINARY=emacs-24.4-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-24.4-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-24.5-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-24.5-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-25.1-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-25.1-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-25.3-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-25.3-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-25.3-travis MAKE_TEST=test-checks
+    - EMACS_BINARY=emacs-26-pretest-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-26-pretest-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-26-pretest-travis MAKE_TEST=test-checks
+    - EMACS_BINARY=emacs-git-snapshot-travis MAKE_TEST=test
+    - EMACS_BINARY=emacs-git-snapshot-travis MAKE_TEST=test-bytecomp
+    - EMACS_BINARY=emacs-git-snapshot-travis MAKE_TEST=test-checks
 
 before_script:
+  - sudo sh travis-ci/travis-gnutls.sh
+  - gnutls-cli -v
   - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
   - evm install $EMACS_BINARY --use --skip
   - make elpa
 script:
   - emacs --version
   - make $MAKE_TEST
-matrix:
-  - env: EMACS_BINARY=emacs-git-snapshot-travis
 
 notifications:
   webhooks:

CHANGELOG.md

@@ -14,12 +14,14 @@
 * [cider-nrepl#438](https://github.com/clojure-emacs/cider-nrepl/pull/438): Improve startup time by deferring loading CIDER's middleware until the first usage.
 * [#2078](https://github.com/clojure-emacs/cider/pull/2078): Improve startup time by bundling together sync requests during startup.
 * `cider-rotate-default-connection` will warn if you use it with only a single active connection.
+* `cider-format-buffer` tries to preserve the point position.
 
 ### Bugs Fixed
 
 * [#2084](https://github.com/clojure-emacs/cider/issues/2084): Select correct REPL type (clj or cljs) in cider-switch-to-repl-buffer conditional on the current buffer.
 * [#2088](https://github.com/clojure-emacs/cider/issues/2088): Fix functions defined with `def` being font-locked as vars instead of functions.
 * [#1651](https://github.com/clojure-emacs/cider/issues/1651), [cider-nrepl#445](https://github.com/clojure-emacs/cider-nrepl/pull/455): Fix `cider-expected-ns` returns `nil` on boot projects.
+* [#2120](https://github.com/clojure-emacs/cider/issues/2120): Fix Travis CI build errors for emacs versions >25.2.
 
 ## 0.15.1 (2017-09-13)
 

cider-apropos.el

@@ -144,9 +144,9 @@ optionally search doc strings (based on DOCS-P), include private vars
                  (y-or-n-p "Case-sensitive? ")))))
   (cider-ensure-connected)
   (cider-ensure-op-supported "apropos")
-  (if-let ((summary (cider-apropos-summary
-                     query ns docs-p privates-p case-sensitive-p))
-           (results (cider-sync-request:apropos query ns docs-p privates-p case-sensitive-p)))
+  (if-let* ((summary (cider-apropos-summary
+                      query ns docs-p privates-p case-sensitive-p))
+            (results (cider-sync-request:apropos query ns docs-p privates-p case-sensitive-p)))
       (cider-show-apropos summary results query docs-p)
     (message "No apropos matches for %S" query)))
 
@@ -191,10 +191,10 @@ optionally search doc strings (based on DOCS-P), include private vars
                  (y-or-n-p "Case-sensitive? ")))))
   (cider-ensure-connected)
   (cider-ensure-op-supported "apropos")
-  (if-let ((summary (cider-apropos-summary
-                     query ns docs-p privates-p case-sensitive-p))
-           (results (mapcar (lambda (r) (nrepl-dict-get r "name"))
-                            (cider-sync-request:apropos query ns docs-p privates-p case-sensitive-p))))
+  (if-let* ((summary (cider-apropos-summary
+                      query ns docs-p privates-p case-sensitive-p))
+            (results (mapcar (lambda (r) (nrepl-dict-get r "name"))
+                             (cider-sync-request:apropos query ns docs-p privates-p case-sensitive-p))))
       (cider-apropos-act-on-symbol (completing-read (concat summary ": ") results))
     (message "No apropos matches for %S" query)))
 

cider-browse-spec.el

@@ -282,7 +282,7 @@ may also be a button, so this function can be used a the button's `action'
 property."
   (interactive)
   (let ((pos (or pos (point))))
-    (when-let ((spec (button-get pos 'spec-name)))
+    (when-let* ((spec (button-get pos 'spec-name)))
       (cider-browse-spec--browse spec))))
 
 ;; Interactive Functions
@@ -292,8 +292,8 @@ property."
   (interactive)
   (cider-ensure-connected)
   (cider-ensure-op-supported "spec-example")
-  (if-let ((spec cider-browse-spec--current-spec))
-      (if-let ((example (cider-sync-request:spec-example spec)))
+  (if-let* ((spec cider-browse-spec--current-spec))
+      (if-let* ((example (cider-sync-request:spec-example spec)))
           (with-current-buffer (cider-popup-buffer cider-browse-spec-example-buffer t)
             (cider-browse-spec-example-mode)
             (setq-local cider-browse-spec--current-spec spec)

cider-classpath.el

@@ -104,7 +104,7 @@
   (interactive)
   (cider-ensure-connected)
   (cider-ensure-op-supported "classpath")
-  (when-let ((entry (completing-read "Classpath entries: " (cider-sync-request:classpath))))
+  (when-let* ((entry (completing-read "Classpath entries: " (cider-sync-request:classpath))))
     (find-file-other-window entry)))
 
 (provide 'cider-classpath)

cider-client.el

@@ -161,11 +161,11 @@ precedence over other connections associated with the same project.
 
 If ALL-CONNECTIONS is non-nil, the return value is a list and all matching
 connections are returned, instead of just the most recent."
-  (when-let ((project-directory (or project-directory
+  (when-let* ((project-directory (or project-directory
                                     (clojure-project-dir (cider-current-dir))))
              (fn (if all-connections #'seq-filter #'seq-find)))
     (or (funcall fn (lambda (conn)
-                      (when-let ((conn-proj-dir (with-current-buffer conn
+                      (when-let* ((conn-proj-dir (with-current-buffer conn
                                                   nrepl-project-dir)))
                         (equal (file-truename project-directory)
                                (file-truename conn-proj-dir))))
@@ -306,7 +306,7 @@ at all."
   "Return the first connection of another type than CONNECTION.
 Only return connections in the same project or nil.
 CONNECTION defaults to `cider-current-connection'."
-  (when-let ((connection (or connection (cider-current-connection)))
+  (when-let* ((connection (or connection (cider-current-connection)))
              (connection-type (cider--connection-type connection)))
     (cider-current-connection (pcase connection-type
                                 (`"clj" "cljs")
@@ -319,7 +319,7 @@ CONNECTION defaults to `cider-current-connection'."
 DO NOT USE THIS FUNCTION.
 It was written only to be used in `cider-map-connections', as a workaround
 to a still-undetermined bug in the state-stracker backend."
-  (when-let ((project-connections (cider-find-connection-buffer-for-project-directory
+  (when-let* ((project-connections (cider-find-connection-buffer-for-project-directory
                                    nil :all-connections))
              (cljs-conn
               ;; So we have multiple connections. Look for the connection type we
@@ -389,7 +389,7 @@ connection but can be invoked from any buffer (like `cider-refresh')."
                             ((err "needs a ClojureScript REPL")))))))
       (funcall function curr)
       (when (eq which :both)
-        (when-let ((other-connection (cider-other-connection curr)))
+        (when-let* ((other-connection (cider-other-connection curr)))
           (funcall function other-connection))))))
 
 
@@ -419,7 +419,7 @@ connection but can be invoked from any buffer (like `cider-refresh')."
 (defun cider-connection-browser ()
   "Open a browser buffer for nREPL connections."
   (interactive)
-  (if-let ((buffer (get-buffer cider--connection-browser-buffer-name)))
+  (if-let* ((buffer (get-buffer cider--connection-browser-buffer-name)))
       (progn
         (cider--connections-refresh-buffer buffer)
         (unless (get-buffer-window buffer)
@@ -430,7 +430,7 @@ connection but can be invoked from any buffer (like `cider-refresh')."
   "Refresh the connections buffer, if the buffer exists.
 The connections buffer is determined by
 `cider--connection-browser-buffer-name'"
-  (when-let ((buffer (get-buffer cider--connection-browser-buffer-name)))
+  (when-let* ((buffer (get-buffer cider--connection-browser-buffer-name)))
     (cider--connections-refresh-buffer buffer)))
 
 (add-hook 'nrepl-disconnected-hook #'cider--connections-refresh)
@@ -622,7 +622,7 @@ REPL's ns, otherwise fall back to \"user\".
 When NO-DEFAULT is non-nil, it will return nil instead of \"user\"."
   (or cider-buffer-ns
       (clojure-find-ns)
-      (when-let ((repl-buf (cider-current-connection)))
+      (when-let* ((repl-buf (cider-current-connection)))
         (buffer-local-value 'cider-buffer-ns repl-buf))
       (if no-default nil "user")))
 
@@ -835,15 +835,15 @@ unless ALL is truthy."
   "Find the definition of VAR, optionally at a specific LINE.
 
 Display the results in a different window."
-  (if-let ((info (cider-var-info var)))
+  (if-let* ((info (cider-var-info var)))
       (progn
         (if line (setq info (nrepl-dict-put info "line" line)))
         (cider--jump-to-loc-from-info info t))
     (user-error "Symbol `%s' not resolved" var)))
 
 (defun cider--find-var (var &optional line)
   "Find the definition of VAR, optionally at a specific LINE."
-  (if-let ((info (cider-var-info var)))
+  (if-let* ((info (cider-var-info var)))
       (progn
         (if line (setq info (nrepl-dict-put info "line" line)))
         (cider--jump-to-loc-from-info info))
@@ -931,11 +931,11 @@ Optional arguments include SEARCH-NS, DOCS-P, PRIVATES-P, CASE-SENSITIVE-P."
 (defun cider-sync-request:complete (str context)
   "Return a list of completions for STR using nREPL's \"complete\" op.
 CONTEXT represents a completion context for compliment."
-  (when-let ((dict (thread-first `("op" "complete"
-                                   "ns" ,(cider-current-ns)
-                                   "symbol" ,str
-                                   "context" ,context)
-                     (cider-nrepl-send-sync-request nil 'abort-on-input))))
+  (when-let* ((dict (thread-first `("op" "complete"
+                                    "ns" ,(cider-current-ns)
+                                    "symbol" ,str
+                                    "context" ,context)
+                      (cider-nrepl-send-sync-request nil 'abort-on-input))))
     (nrepl-dict-get dict "completions")))
 
 (defun cider-sync-request:complete-flush-caches ()
@@ -958,22 +958,22 @@ CONTEXT represents a completion context for compliment."
 
 (defun cider-sync-request:eldoc (symbol &optional class member)
   "Send \"eldoc\" op with parameters SYMBOL or CLASS and MEMBER."
-  (when-let ((eldoc (thread-first `("op" "eldoc"
-                                    "ns" ,(cider-current-ns)
-                                    ,@(when symbol `("symbol" ,symbol))
-                                    ,@(when class `("class" ,class))
-                                    ,@(when member `("member" ,member)))
-                      (cider-nrepl-send-sync-request nil 'abort-on-input))))
+  (when-let* ((eldoc (thread-first `("op" "eldoc"
+                                     "ns" ,(cider-current-ns)
+                                     ,@(when symbol `("symbol" ,symbol))
+                                     ,@(when class `("class" ,class))
+                                     ,@(when member `("member" ,member)))
+                       (cider-nrepl-send-sync-request nil 'abort-on-input))))
     (if (member "no-eldoc" (nrepl-dict-get eldoc "status"))
         nil
       eldoc)))
 
 (defun cider-sync-request:eldoc-datomic-query (symbol)
   "Send \"eldoc-datomic-query\" op with parameter SYMBOL."
-  (when-let ((eldoc (thread-first `("op" "eldoc-datomic-query"
-                                    "ns" ,(cider-current-ns)
-                                    ,@(when symbol `("symbol" ,symbol)))
-                      (cider-nrepl-send-sync-request nil 'abort-on-input))))
+  (when-let* ((eldoc (thread-first `("op" "eldoc-datomic-query"
+                                     "ns" ,(cider-current-ns)
+                                     ,@(when symbol `("symbol" ,symbol)))
+                       (cider-nrepl-send-sync-request nil 'abort-on-input))))
     (if (member "no-eldoc" (nrepl-dict-get eldoc "status"))
         nil
       eldoc)))

cider-common.el

@@ -192,14 +192,14 @@ relative, it is expanded within each of the open Clojure buffers till an
 existing file ending with URL has been found."
   (require 'arc-mode)
   (cond ((string-match "^file:\\(.+\\)" url)
-         (when-let ((file (cider--url-to-file (match-string 1 url)))
-                    (path (cider--file-path file)))
+         (when-let* ((file (cider--url-to-file (match-string 1 url)))
+                     (path (cider--file-path file)))
            (find-file-noselect path)))
         ((string-match "^\\(jar\\|zip\\):\\(file:.+\\)!/\\(.+\\)" url)
-         (when-let ((entry (match-string 3 url))
-                    (file  (cider--url-to-file (match-string 2 url)))
-                    (path  (cider--file-path file))
-                    (name  (format "%s:%s" path entry)))
+         (when-let* ((entry (match-string 3 url))
+                     (file  (cider--url-to-file (match-string 2 url)))
+                     (path  (cider--file-path file))
+                     (name  (format "%s:%s" path entry)))
            (or (find-buffer-visiting name)
                (if (tramp-tramp-file-p path)
                    (progn
@@ -223,7 +223,7 @@ existing file ending with URL has been found."
                    (set-buffer-modified-p nil)
                    (set-auto-mode)
                    (current-buffer))))))
-        (t (if-let ((path (cider--file-path url)))
+        (t (if-let* ((path (cider--file-path url)))
                (find-file-noselect path)
              (unless (file-name-absolute-p url)
                (let ((cider-buffers (cider-util--clojure-buffers))

cider-compat.el

@@ -125,33 +125,27 @@ threading."
 
 (eval-and-compile
 
-  (unless (fboundp 'if-let)
-    (defmacro if-let (bindings then &rest else)
+  (unless (fboundp 'if-let*)
+    (defmacro if-let* (bindings then &rest else)
       "Process BINDINGS and if all values are non-nil eval THEN, else ELSE.
 Argument BINDINGS is a list of tuples whose car is a symbol to be
 bound and (optionally) used in THEN, and its cadr is a sexp to be
-evalled to set symbol's value.  In the special case you only want
-to bind a single value, BINDINGS can just be a plain tuple."
+evalled to set symbol's value."
       (declare (indent 2)
                (debug ([&or (&rest (symbolp form)) (symbolp form)] form body)))
-      (when (and (<= (length bindings) 2)
-                 (not (listp (car bindings))))
-        ;; Adjust the single binding case
-        (setq bindings (list bindings)))
       `(let* ,(internal--build-bindings bindings)
          (if ,(car (internal--listify (car (last bindings))))
              ,then
            ,@else))))
 
-  (unless (fboundp 'when-let)
-    (defmacro when-let (bindings &rest body)
+  (unless (fboundp 'when-let*)
+    (defmacro when-let* (bindings &rest body)
       "Process BINDINGS and if all values are non-nil eval BODY.
 Argument BINDINGS is a list of tuples whose car is a symbol to be
 bound and (optionally) used in BODY, and its cadr is a sexp to be
-evalled to set symbol's value.  In the special case you only want
-to bind a single value, BINDINGS can just be a plain tuple."
-      (declare (indent 1) (debug if-let))
-      `(if-let ,bindings ,(macroexp-progn body)))))
+evalled to set symbol's value."
+      (declare (indent 1) (debug if-let*))
+      `(if-let* ,bindings ,(macroexp-progn body)))))
 
 (eval-and-compile