branch: master
commit abded5f8b0eb4b56753b97fab742f873f0481beb
Author: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Commit: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
    Check for compositions on old Emacsen.
    
    Prettify Symbols Mode used to use the `composition' text property for
    prettification.
---
 context-coloring-test.el |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/context-coloring-test.el b/context-coloring-test.el
index 79e5f23..fef12d5 100644
--- a/context-coloring-test.el
+++ b/context-coloring-test.el
@@ -347,8 +347,12 @@ signaled."
 (when (fboundp 'prettify-symbols-mode)
 
   (defun context-coloring-test-assert-prettify-symbols-text-properties ()
-    (unless (and (get-text-property 2 'prettify-symbols-start)
-                 (get-text-property 2 'prettify-symbols-end))
+    (unless (cond
+             ((version< emacs-version "25.0")
+              (get-text-property 2 'composition))
+             (t
+              (and (get-text-property 2 'prettify-symbols-start)
+                   (get-text-property 2 'prettify-symbols-end))))
       (ert-fail "Expected buffer to have it's symbols prettified, but it 
didn't.")))
 
   (context-coloring-test-deftest prettify-symbols-enabled-before

Reply via email to