[nongnu] elpa/cider 4260f10e9a 5/8: Remove unnecessary autoload, add tagged choices

[ELPA Syncer]

branch: elpa/cider
commit 4260f10e9a8abdf60f6174c86730edfa05356a9b
Author: yuhan0 <qythium@gmail.com>
Commit: Bozhidar Batsov <bozhidar@batsov.dev>

    Remove unnecessary autoload, add tagged choices
---
 cider-connection.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cider-connection.el b/cider-connection.el
index 2d3c12bd7b..9bd2b24438 100644
--- a/cider-connection.el
+++ b/cider-connection.el
@@ -61,7 +61,6 @@ available) and the matching REPL buffer."
   :safe #'booleanp
   :package-version '(cider . "0.9.0"))
 
-;;;###autoload
 (defcustom cider-merge-sessions nil
   "Controls session combination behaviour.
 
@@ -69,7 +68,9 @@ Symbol `host' combines all sessions of a project associated 
with the same host.
 Symbol `project' combines all sessions of a project.
 
 All other values do not combine any sessions."
-  :type 'symbol
+  :type '(choice (const :tag "Combine all sessions with the same host" host)
+                 (const :tag "Combine all sessions from the same project" 
project)
+                 (other :tag "Do not combine any sessions"))
   :group 'cider
   :safe #'symbolp
   :package-version '(cider . "1.5"))