Merge branch 'extra-eldoc-commands' of https://github.com/metajack/nr…

…epl.el into metajack-extra-eldoc-commands

nrepl.el

@@ -141,6 +141,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 +383,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