[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 3bb1515 018/177: Merge pull request #409 from npostavs/fon
From: |
João Távora |
Subject: |
[elpa] master 3bb1515 018/177: Merge pull request #409 from npostavs/font-lock |
Date: |
Sat, 28 Mar 2015 15:40:31 +0000 |
branch: master
commit 3bb151504648f15a5b907612bc7cd473613686dd
Merge: 7849ffc f21ddd1
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Merge pull request #409 from npostavs/font-lock
Fix yas--font-lock-keywords
---
yasnippet.el | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index 8149acc..afa0a42 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -814,8 +814,6 @@ Honour `yas-dont-activate', which see."
(defvar yas--font-lock-keywords
(append '(("^#.*$" . font-lock-comment-face))
- lisp-font-lock-keywords
- lisp-font-lock-keywords-1
lisp-font-lock-keywords-2
'(("$\\([0-9]+\\)"
(0 font-lock-keyword-face)
@@ -823,8 +821,8 @@ Honour `yas-dont-activate', which see."
("${\\([0-9]+\\):?"
(0 font-lock-keyword-face)
(1 font-lock-warning-face t))
- ("${" font-lock-keyword-face)
- ("$[0-9]+?" font-lock-preprocessor-face)
+ ("${" . font-lock-keyword-face)
+ ("$[0-9]+?" . font-lock-preprocessor-face)
("\\(\\$(\\)" 1 font-lock-preprocessor-face)
("}"
(0 font-lock-keyword-face)))))
- [elpa] master 13cfdbc 009/177: fix: remove references to dropdown-list.el in Rakefile, (continued)
- [elpa] master 13cfdbc 009/177: fix: remove references to dropdown-list.el in Rakefile, João Távora, 2015/03/28
- [elpa] master 8853127 007/177: Update manual.mdown, João Távora, 2015/03/28
- [elpa] master d963c41 010/177: Closes #406: correct docstring for yas-extra-modes, João Távora, 2015/03/28
- [elpa] master f21ddd1 012/177: remove redundant font-lock-keywords, João Távora, 2015/03/28
- [elpa] master 90d4cae 013/177: inhibit change hooks during (insert content), João Távora, 2015/03/28
- [elpa] master 7849ffc 015/177: fix: don't use universal-argument-num-events, João Távora, 2015/03/28
- [elpa] master 6997922 016/177: Revert "inhibit change hooks during (insert content)", João Távora, 2015/03/28
- [elpa] master 6268cc2 014/177: add: test for issue #404, João Távora, 2015/03/28
- [elpa] master 5c76a0f 019/177: test middle-of-buffer snippet insertion, João Távora, 2015/03/28
- [elpa] master 51e9e8e 017/177: wait till after content insertion to narrow, João Távora, 2015/03/28
- [elpa] master 3bb1515 018/177: Merge pull request #409 from npostavs/font-lock,
João Távora <=
- [elpa] master 6c3e029 020/177: Merge pull request #412 from npostavs/less-narrow, João Távora, 2015/03/28
- [elpa] master 32ee5cb 021/177: Closes #415: remove c-specific hacks, harmful on emacs 24.3, João Távora, 2015/03/28
- [elpa] master ffd497d 022/177: don't kill snippet buffer unless saved, João Távora, 2015/03/28
- [elpa] master 205b0e6 023/177: move snippet saving from loading to closing, João Távora, 2015/03/28
- [elpa] master 33dff9a 024/177: let C-c C-c save existing snippets too, João Távora, 2015/03/28
- [elpa] master d7b2b89 027/177: widen before deleting regions, João Távora, 2015/03/28
- [elpa] master 84b7e69 025/177: Merge pull request #423 from npostavs/load-snippet-ui, João Távora, 2015/03/28
- [elpa] master 43a484e 028/177: add: external test for issue #404, João Távora, 2015/03/28
- [elpa] master d5d6e45 026/177: Feature: de/activate-extra-mode, João Távora, 2015/03/28
- [elpa] master 6ee3d2e 029/177: Closes #404: merge remote-tracking branch 'npostavs/widen', João Távora, 2015/03/28