Skip to content

Commit

Permalink
Merge pull request #1261 from clojure-emacs/clear-buffer-stops-working
Browse files Browse the repository at this point in the history
[Fix #1252] Fix breakage in cider-repl-clear-buffer
  • Loading branch information
bbatsov committed Aug 17, 2015
2 parents a1e4d7c + 2cccb45 commit 2dccfd6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* Renamed `cider-repl-output-face` to `cider-repl-stdout-face` and `cider-repl-err-output-face` to `cider-repl-stderr-face`.

### Bugs fixed

* [#1252](https://github.com/clojure-emacs/cider/issues/1252) `cider-repl-clear-buffer` stops working in certain circumstances.
* [#1164](https://github.com/clojure-emacs/cider/pull/1164): Fix an error in `cider-browse-ns--doc-at-point`.
* [#1189](https://github.com/clojure-emacs/cider/issues/1189): Don't show result from automatic ns form evaluation.
* [#1079](https://github.com/clojure-emacs/cider/issues/1079): Don't try to font-lock very long results. The maximum font-lockable result length is controlled by `cider-font-lock-max-length`.
Expand Down
8 changes: 2 additions & 6 deletions cider-repl.el
Original file line number Diff line number Diff line change
Expand Up @@ -686,12 +686,8 @@ text property `cider-old-input'."

(defun cider-repl--end-of-line-before-input-start ()
"Return the position of the end of the line preceding the beginning of input."
(save-excursion
(goto-char cider-repl-input-start-mark)
;; do not use `previous-line', but `line-move' with noerror
;; moving up from the first line should not throw error
(line-move -1 t nil nil)
(line-end-position)))
(1- (previous-single-property-change cider-repl-input-start-mark 'field nil
(1+ (point-min)))))

(defun cider-repl-clear-output ()
"Delete the output inserted since the last input."
Expand Down

0 comments on commit 2dccfd6

Please sign in to comment.