[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master abded5f 14/21: Check for compositions on old Emacsen.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master abded5f 14/21: Check for compositions on old Emacsen. |
Date: |
Fri, 23 Dec 2016 20:27:52 +0000 (UTC) |
branch: master
commit abded5f8b0eb4b56753b97fab742f873f0481beb
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
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
- [elpa] master updated (580a1b6 -> 5402f35), Jackson Ray Hamilton, 2016/12/23
- [elpa] master 60fca70 03/21: Fix quoting problem in docstring., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 6a2c6fe 04/21: Clean up local variable., Jackson Ray Hamilton, 2016/12/23
- [elpa] master c79499a 02/21: Remove erroneous block scope assertion., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 2de2dd8 12/21: Make binaries configurable in Makefile., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 3e778f6 18/21: Merge pull request #6 from jacksonrayhamilton/narrow-to-region, Jackson Ray Hamilton, 2016/12/23
- [elpa] master 26f48c5 06/21: Improve Font Lock integration., Jackson Ray Hamilton, 2016/12/23
- [elpa] master c847b0f 01/21: Mention tern-context-coloring in README., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 54593e5 11/21: Add Emacs 25.1 to the build matrix., Jackson Ray Hamilton, 2016/12/23
- [elpa] master abded5f 14/21: Check for compositions on old Emacsen.,
Jackson Ray Hamilton <=
- [elpa] master 269a382 15/21: Ensure coloring still works after prettification., Jackson Ray Hamilton, 2016/12/23
- [elpa] master b3ea138 19/21: Remove no-byte-compile from development files., Jackson Ray Hamilton, 2016/12/23
- [elpa] master ce29abd 17/21: Don't color before or beyond the buffer., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 45b5ad0 16/21: Merge pull request #5 from jacksonrayhamilton/prettify-symbols, Jackson Ray Hamilton, 2016/12/23
- [elpa] master 5fe3695 07/21: Revert "Clean up local variable.", Jackson Ray Hamilton, 2016/12/23
- [elpa] master 550e61b 08/21: Merge branch 'master' into prettify-symbols, Jackson Ray Hamilton, 2016/12/23
- [elpa] master a1a6256 05/21: Set up post-colorize hooks., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 4836dd0 10/21: Add tests for prettifying symbols., Jackson Ray Hamilton, 2016/12/23
- [elpa] master edbb191 13/21: Feature-detect prettify-symbols-mode for Emacs 24.3 compat., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 3985437 09/21: Use a mode hook for detecting entering Prettify Symbols mode., Jackson Ray Hamilton, 2016/12/23