From e9dfe28fcb99c696530980070be5e605bfc6aa51 Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Tue, 5 Apr 2016 16:47:50 +0200 Subject: [PATCH] Use default face in quasi quotes --- haskell-font-lock.el | 8 ++++++-- tests/haskell-font-lock-tests.el | 9 ++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/haskell-font-lock.el b/haskell-font-lock.el index 4a52efa78..ad342995b 100644 --- a/haskell-font-lock.el +++ b/haskell-font-lock.el @@ -439,8 +439,12 @@ like ::, class, instance, data, newtype, type." (while (setq next (next-single-property-change pos 'face)) (put-text-property (+ start (1- pos)) (1- (+ start next)) 'face - (get-text-property pos 'face) org-buffer) - (setq pos next))) + (or (get-text-property pos 'face) 'default) org-buffer) + (setq pos next)) + (unless (equal pos (point-max)) + (put-text-property + (+ start (1- pos)) (1- (+ start (point-max))) 'face + 'default org-buffer))) (add-text-properties start end '(font-lock-fontified t fontified t font-lock-multiline t)) diff --git a/tests/haskell-font-lock-tests.el b/tests/haskell-font-lock-tests.el index 8b3e900a8..3d8bdf220 100644 --- a/tests/haskell-font-lock-tests.el +++ b/tests/haskell-font-lock-tests.el @@ -371,19 +371,18 @@ (check-properties '("sql = [sql| SELECT title FROM books; |]") '(("SELECT" t font-lock-keyword-face) - ("title" t nil) + ("title" t default) ("FROM" t font-lock-keyword-face) - ("books" t nil)))) + ("books" t default)))) (ert-deftest haskell-syntactic-test-quasiquoter-sql-2 () "Embedded SQL statements" - :expected-result :failed ;; for now we have this problem that connstructor faces are used, ;; org-mode knows how to get around this problem (check-properties '("sql = [sql| SELECT Title FROM Books; |]") - '(("Title" t nil) - ("Books" t nil)))) + '(("Title" t default) + ("Books" t default)))) (ert-deftest haskell-syntactic-test-special-not-redefined ()