[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 89a74bb 2/9: Avoid further confusion when an alias matches
From: |
Artur Malabarba |
Subject: |
[elpa] master 89a74bb 2/9: Avoid further confusion when an alias matches the current name |
Date: |
Wed, 09 Sep 2015 11:08:19 +0000 |
branch: master
commit 89a74bbffb6ba2c419c039b4422326c1385edcc7
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Avoid further confusion when an alias matches the current name
---
nameless.el | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/nameless.el b/nameless.el
index 415dfe0..26b1024 100644
--- a/nameless.el
+++ b/nameless.el
@@ -99,7 +99,8 @@ for it to take effect."
(defun nameless--compose-as (display)
"Compose the matched region and return a face spec."
(when (and nameless-mode
- (not (get-text-property (match-beginning 0) 'composition)))
+ (not (get-text-property (match-beginning 1) 'composition))
+ (not (get-text-property (match-beginning 1) 'display)))
(let ((compose (save-match-data
(and nameless-affect-indentation-and-filling
(or (not (eq nameless-affect-indentation-and-filling
'outside-strings))
- [elpa] master updated (a1c9e99 -> 8ad76a7), Artur Malabarba, 2015/09/09
- [elpa] master 89a74bb 2/9: Avoid further confusion when an alias matches the current name,
Artur Malabarba <=
- [elpa] master c97ac2b 4/9: Merge pull request #4 from cpitclaudel/master, Artur Malabarba, 2015/09/09
- [elpa] master e0f5357 3/9: Add a missing 'delete-selection property, Artur Malabarba, 2015/09/09
- [elpa] master 6fd3a49 7/9: Fix doc, Artur Malabarba, 2015/09/09
- [elpa] master 6087323 8/9: Version bump, Artur Malabarba, 2015/09/09
- [elpa] master b580ee6 6/9: [Fix #6] Local variables not being used, Artur Malabarba, 2015/09/09
- [elpa] master 489378f 1/9: Avoid confusion when an alias matches the current name, Artur Malabarba, 2015/09/09
- [elpa] master fe3829f 5/9: Improve documentation and change keybind from _ to C-c C--, Artur Malabarba, 2015/09/09
- [elpa] master 8ad76a7 9/9: Merge commit '60873230991f7a0cd3175eb578fee34c7e238fb3', Artur Malabarba, 2015/09/09