summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2015-08-24 22:36:49 +0100
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-08-24 22:36:49 +0100
commitd8fc78fd3ae47dfbdff598b9da26d99341769c8b (patch)
tree0f81ebe45e537bc809ad9565d0bdc3880fa14ac5
parent38261508436a1648c35b5f7c07dc697f1def0d8e (diff)
[Fix #1272] Return a proper button string in cider--readme-button
-rw-r--r--cider-interaction.el2
-rw-r--r--cider-util.el18
2 files changed, 11 insertions, 9 deletions
diff --git a/cider-interaction.el b/cider-interaction.el
index b4d9e1cf..f26c2043 100644
--- a/cider-interaction.el
+++ b/cider-interaction.el
@@ -337,7 +337,7 @@ Signal an error if it is not supported."
(if nrepl-version
(when (version< nrepl-version cider-required-nrepl-version)
(cider-repl-emit-interactive-stderr
- (cider--insert-readme-button
+ (cider--readme-button
(format "WARNING: CIDER requires nREPL %s (or newer) to work properly"
cider-required-nrepl-version)
"warning-saying-you-have-to-use-nrepl-027")))
diff --git a/cider-util.el b/cider-util.el
index b637e29e..3935d818 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -171,16 +171,18 @@ objects."
"Return t if SYM is namespace-qualified."
(string-match-p "[^/]+/" sym))
-(defun cider--insert-readme-button (label section-id)
- "Insert a button that links to the online readme.
+(defun cider--readme-button (label section-id)
+ "Return a button string that links to the online readme.
LABEL is the displayed string, and SECTION-ID is where it points
to."
- (insert-button
- label
- 'follow-link t
- 'action (lambda (&rest _) (interactive)
- (browse-url (concat "https://github.com/clojure-emacs/cider#"
- section-id)))))
+ (with-temp-buffer
+ (insert-text-button
+ label
+ 'follow-link t
+ 'action (lambda (&rest _) (interactive)
+ (browse-url (concat "https://github.com/clojure-emacs/cider#"
+ section-id))))
+ (buffer-string)))
(defun cider--project-name (dir)
"Extracts a project name from DIR, possibly nil.