diff options
| author | Jeff Valk <jv@jeffvalk.com> | 2015-12-26 19:09:45 -0500 |
|---|---|---|
| committer | Jeff Valk <jv@jeffvalk.com> | 2015-12-26 19:47:52 -0500 |
| commit | 316f75b7e4b214fdab8f11d34708b5670631e1f5 (patch) | |
| tree | d9dce8e903cb03af753fac1285b25908e73f3f7c | |
| parent | 546de8f6f2e68f6854e3363e8da94fb5ce1225d2 (diff) | |
[Fix #1486] Complete a partial fix in stacktrace font-locking.
Update stack frame buttons to use `font-lock-face`.
Create a button type that respects `font-lock-face`. By default, buttons use `'face`.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | cider-stacktrace.el | 3 | ||||
| -rw-r--r-- | cider-util.el | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ea610f19..5a7b244a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and try to associate the created connection with this project automatically. * [#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 diff --git a/cider-stacktrace.el b/cider-stacktrace.el index d24531e6..a6136838 100644 --- a/cider-stacktrace.el +++ b/cider-stacktrace.el @@ -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 " ")) diff --git a/cider-util.el b/cider-util.el index d74df392..d9d734d7 100644 --- a/cider-util.el +++ b/cider-util.el @@ -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) |