diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-01-10 08:50:33 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-01-10 08:50:33 -0700 |
| commit | 9fa91217c2582736e929bab41cb58f506d4d0b7f (patch) | |
| tree | 6932cef398345f25acba2737d8f9b696ee040b88 /cider-eval.el | |
| parent | b17a12b301a82f1e1ab9b19674aeb7fff3c25b40 (diff) | |
| parent | cd71f5cc12c93355cdf5698ac0aee9606480176a (diff) | |
Merge tag 'v0.19.0+dfsg'
DFSG-clean upstream version 0.19.0
Diffstat (limited to 'cider-eval.el')
| -rw-r--r-- | cider-eval.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cider-eval.el b/cider-eval.el index 67f2706b..946d55ee 100644 --- a/cider-eval.el +++ b/cider-eval.el @@ -1,7 +1,7 @@ ;;; cider-eval.el --- Interactive evaluation (compilation) functionality -*- lexical-binding: t -*- ;; Copyright © 2012-2013 Tim King, Phil Hagelberg, Bozhidar Batsov -;; Copyright © 2013-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors +;; Copyright © 2013-2019 Bozhidar Batsov, Artur Malabarba and CIDER contributors ;; ;; Author: Tim King <kingtim@gmail.com> ;; Phil Hagelberg <technomancy@gmail.com> @@ -168,7 +168,8 @@ When invoked with a prefix ARG the command doesn't prompt for confirmation." (defun cider--quit-error-window () "Buries the `cider-error-buffer' and quits its containing window." (when-let* ((error-win (get-buffer-window cider-error-buffer))) - (quit-window nil error-win))) + (save-excursion + (quit-window nil error-win)))) ;;; Dealing with compilation (evaluation) errors and warnings @@ -377,7 +378,8 @@ evaluation command. Honor `cider-auto-jump-to-error'." (let* ((face (nth 3 info)) (note (nth 4 info)) (auto-jump (if (eq cider-auto-jump-to-error 'errors-only) - (not (eq face 'cider-warning-highlight-face)) + (not (or (eq face 'cider-warning-highlight-face) + (string-match-p "warning" note))) cider-auto-jump-to-error))) (overlay-put overlay 'cider-note-p t) (overlay-put overlay 'font-lock-face face) |