[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 74aa97f: * packages/yasnippet: Fix some compilation warnin
From: |
Stefan Monnier |
Subject: |
[elpa] master 74aa97f: * packages/yasnippet: Fix some compilation warnings |
Date: |
Wed, 22 Jun 2016 12:53:18 +0000 (UTC) |
branch: master
commit 74aa97f31a5bc11009ce5bfddfd9fcbde1bbc89b
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* packages/yasnippet: Fix some compilation warnings
* packages/yasnippet/yasnippet-tests.el (complicated-yas-key-syntaxes):
Avoid looking-back.
* packages/yasnippet/yasnippet.el (yas--font-lock-keywords): Escape $, even
if
first in the regexp.
(yas--indent): Remove unused var `end'.
(yas--indent-parse-create): Remove unused arg `snippet'. Update caller.
---
packages/yasnippet/yasnippet-tests.el | 2 +-
packages/yasnippet/yasnippet.el | 23 +++++++++++------------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/packages/yasnippet/yasnippet-tests.el
b/packages/yasnippet/yasnippet-tests.el
index 9d2074a..47b6e1f 100644
--- a/packages/yasnippet/yasnippet-tests.el
+++ b/packages/yasnippet/yasnippet-tests.el
@@ -484,7 +484,7 @@ TODO: correct this bug!"
(yas-should-expand '(("foo-barbaz" . "OKfoo-barbazOK"))))
(let ((yas-key-syntaxes
(cons #'(lambda (_start-point)
- (unless (looking-back "-")
+ (unless (eq ?- (char-before))
(backward-char)
'again))
yas-key-syntaxes))
diff --git a/packages/yasnippet/yasnippet.el b/packages/yasnippet/yasnippet.el
index 8a4ef1d..ed52907 100644
--- a/packages/yasnippet/yasnippet.el
+++ b/packages/yasnippet/yasnippet.el
@@ -896,10 +896,10 @@ Honour `yas-dont-activate-functions', which see."
;; They're "compiled", so extract the source.
(cadr font-lock-keywords)
font-lock-keywords))
- '(("$\\([0-9]+\\)"
+ '(("\\$\\([0-9]+\\)"
(0 font-lock-keyword-face)
(1 font-lock-string-face t))
- ("${\\([0-9]+\\):?"
+ ("\\${\\([0-9]+\\):?"
(0 font-lock-keyword-face)
(1 font-lock-warning-face t))
("\\(\\$(\\)" 1 font-lock-preprocessor-face)
@@ -3860,7 +3860,7 @@ Meant to be called in a narrowed buffer, does various
passes"
(yas--protect-escapes)
;; Parse indent markers: `$>'.
(goto-char parse-start)
- (yas--indent-parse-create snippet)
+ (yas--indent-parse-create)
;; parse fields with {}
;;
(goto-char parse-start)
@@ -3966,12 +3966,11 @@ The SNIPPET's markers are preserved."
(zerop (current-column)))
(indent-to-column yas--indent-original-column)))
((eq yas-indent-line 'auto)
- (let ((end (set-marker (make-marker) (point-max))))
- (unless yas-also-auto-indent-first-line
- (forward-line 1))
- (yas--indent-region (line-beginning-position)
- (point-max)
- snippet))))))
+ (unless yas-also-auto-indent-first-line
+ (forward-line 1))
+ (yas--indent-region (line-beginning-position)
+ (point-max)
+ snippet)))))
(defun yas--collect-snippet-markers (snippet)
"Make a list of all the markers used by SNIPPET."
@@ -4064,8 +4063,8 @@ with their evaluated value into
`yas--backquote-markers-and-strings'."
(set-marker-insertion-type marker nil)
marker))
-(defun yas--indent-parse-create (snippet)
- "Parse the \"$>\" indentation markers in SNIPPET."
+(defun yas--indent-parse-create ()
+ "Parse the \"$>\" indentation markers just inserted."
(setq yas--indent-markers ())
(while (search-forward "$>" nil t)
(delete-region (match-beginning 0) (match-end 0))
@@ -4523,7 +4522,7 @@ and return the directory. Return nil if not found."
yas-after-exit-snippet-hook
yas-before-expand-snippet-hook
yas-buffer-local-condition
- yas-dont-activate
+ yas-dont-activate-functions
;; prompting functions
;;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master 74aa97f: * packages/yasnippet: Fix some compilation warnings,
Stefan Monnier <=