Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into issue-86

Conflicts:
	nrepl.el
  • Loading branch information...
commit 3ee09f32516df2fc43c7679780018704bf6bed54 2 parents b4f3092 + 4166c7f
@kingtim kingtim authored
Showing with 15 additions and 5 deletions.
  1. +11 −1 README.md
  2. +4 −4 nrepl.el
View
12 README.md
@@ -5,7 +5,8 @@ the Clojure networked REPL server.
## Installation
-Available on the [Marmalade repo](http://marmalade-repo.org/packages/nrepl).
+`nrepl.el` is available on the both [Marmalade](http://marmalade-repo.org/packages/nrepl)
+and [MELPA](http://melpa.milkbox.net) repos.
If you're not already using Marmalade, add this to your
`~/.emacs.d/init.el` and load it with `M-x eval-buffer`.
@@ -17,6 +18,15 @@ If you're not already using Marmalade, add this to your
(package-initialize)
```
+For MELPA the code you need to add is:
+
+```lisp
+(require 'package)
+(add-to-list 'package-archives
+ '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(package-initialize)
+```
+
And then you can install:
`M-x package-install [RET] nrepl [RET]`
View
8 nrepl.el
@@ -1530,7 +1530,7 @@ under point, prompts for a var."
(when (string-match "nREPL server started on port \\([0-9]+\\)" output)
(let ((port (string-to-number (match-string 1 output))))
(message (format "nREPL server started on %s" port))
- (nrepl port))))
+ (nrepl "localhost" port))))
(defun nrepl-server-sentinel (process event)
(let* ((b (process-buffer process))
@@ -1594,10 +1594,10 @@ under point, prompts for a var."
(add-hook 'nrepl-connected-hook 'nrepl-enable-on-existing-clojure-buffers)
;;;###autoload
-(defun nrepl (port)
- (interactive "nPort: ")
+(defun nrepl (host port)
+ (interactive "MHost: \nnPort: ")
(let ((nrepl-buffer (switch-to-buffer-other-window (generate-new-buffer-name "*nrepl*")))
- (process (nrepl-connect "localhost" port)))
+ (process (nrepl-connect host port)))
(nrepl-init-repl-buffer process nrepl-buffer)))
(provide 'nrepl)
Please sign in to comment.
Something went wrong with that request. Please try again.