Skip to content

Commit

Permalink
[Fix clojure-emacs#1486] Complete a partial fix in stacktrace font-lo…
Browse files Browse the repository at this point in the history
…cking.

Update stack frame buttons to use `font-lock-face`.
Create a button type that respects `font-lock-face`. By default, buttons use `'face`.
  • Loading branch information
jeffvalk authored and cap10morgan committed Dec 27, 2015
1 parent dd1871a commit d57b393
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* [#1475](https://github.com/clojure-emacs/cider/pull/1475): Fix `args-out-of-range` error in `cider--get-symbol-indent`.
* [#1479](https://github.com/clojure-emacs/cider/pull/1479): Make paredit and `cider-repl-mode` play nice.
* [#1452](https://github.com/clojure-emacs/cider/issues/1452): Prevent ANSI color overlays in the REPL buffer from being extended.
* [#1486](https://github.com/clojure-emacs/cider/issues/1486): Complete a partial fix in stacktrace font-locking.

## 0.10.0 / 2015-12-03

Expand Down
3 changes: 2 additions & 1 deletion cider-stacktrace.el
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,8 @@ This associates text properties to enable filtering and source navigation."
'flags flags 'follow-link t
'action 'cider-stacktrace-navigate
'help-echo "View source at this location"
'face 'cider-stacktrace-face)
'font-lock-face 'cider-stacktrace-face
'type 'cider-plain-button)
(save-excursion
(let ((p4 (point))
(p1 (search-backward " "))
Expand Down
4 changes: 4 additions & 0 deletions cider-util.el
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ Unless you specify a BUFFER it will default to the current one."
"Font-lock STRING as Clojure code."
(cider-font-lock-as 'clojure-mode string))

;; Button allowing use of `font-lock-face', ignoring any inherited `face'
(define-button-type 'cider-plain-button
'face nil)

;;; Colors

(defun cider-scale-color (color scale)
Expand Down

0 comments on commit d57b393

Please sign in to comment.