Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into emit-stdout-in-repl

  • Loading branch information...
commit ceb9d98f49194c4b396bec1eca18962083256c8a 2 parents 46d4230 + 2da0af6
Tim King kingtim authored
Showing with 5 additions and 0 deletions.
  1. +5 −0 nrepl.el
5 nrepl.el
View
@@ -47,6 +47,7 @@
(require 'etags)
(require 'arc-mode)
(require 'ansi-color)
+(require 'eldoc)
(eval-when-compile
(require 'cl))
@@ -141,6 +142,9 @@ joined together.")
(defvar nrepl-err-handler 'nrepl-default-err-handler
"Evaluation error handler")
+(defvar nrepl-extra-eldoc-commands '("nrepl-complete" "yas/expand")
+ "Extra commands to be added to eldoc's safe commands list.")
+
(defcustom nrepl-popup-stacktraces t
"Non-nil means pop-up error stacktraces.
Nil means do not, useful when in repl"
@@ -380,6 +384,7 @@ joined together.")
(defun nrepl-eldoc-enable-in-current-buffer ()
(make-local-variable 'eldoc-documentation-function)
(setq eldoc-documentation-function 'nrepl-eldoc)
+ (apply 'eldoc-add-command nrepl-extra-eldoc-commands)
(turn-on-eldoc-mode))
;;; Response handlers
Please sign in to comment.
Something went wrong with that request. Please try again.