branch: master
commit ee6e7a96024a3a7dd268da0c19a13198a4d3fc55
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Noam Postavsky <npost...@users.sourceforge.net>
Fix some compilation warnings
* yasnippet-tests.el (complicated-yas-key-syntaxes): Avoid looking-back.
* 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.
---
yasnippet-tests.el | 2 +-
yasnippet.el | 21 ++++++++++-----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 9d2074a..47b6e1f 100644
--- a/yasnippet-tests.el
+++ b/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/yasnippet.el b/yasnippet.el
index 1ee687a..6573f36 100644
--- a/yasnippet.el
+++ b/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)
@@ -3855,7 +3855,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)
@@ -3961,12 +3961,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."
@@ -4073,8 +4072,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))
