From d57b39315a3f8c78ea20008b3db9f5353a5694d3 Mon Sep 17 00:00:00 2001
From: Jeff Valk <jv@jeffvalk.com>
Date: Sat, 26 Dec 2015 19:09:45 -0500
Subject: [PATCH] [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`.
---
 CHANGELOG.md        | 1 +
 cider-stacktrace.el | 3 ++-
 cider-util.el       | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f0d98f66..a33169f3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/cider-stacktrace.el b/cider-stacktrace.el
index d24531e64..a6136838b 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 d74df3922..d9d734d70 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)