ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-13 21:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid the problem where the condition is evaluated twice

Browse Source
This commit is contained in:
Zhang Chiyuan 2008-04-10 04:39:56 +00:00
parent 60cf669105
commit 6f220b1243
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
yasnippet.el
View File

@ -451,19 +451,21 @@ the template of a snippet in the current snippet-table."
(let ((start (point))
(end (point))
(syntaxes yas/key-syntaxes)
syntax done)
syntax done templates)
(while (and (not done) syntaxes)
(setq syntax (car syntaxes))
(setq syntaxes (cdr syntaxes))
(save-excursion
(skip-syntax-backward syntax)
(setq start (point)))
(if (yas/snippet-table-fetch
(yas/current-snippet-table)
(buffer-substring-no-properties start end))
(setq templates
(yas/snippet-table-fetch
(yas/current-snippet-table)
(buffer-substring-no-properties start end)))
(if templates
(setq done t)
(setq start end)))
(list (buffer-substring-no-properties start end)
(list templates
start
end)))
@ -1115,19 +1117,17 @@ when the condition evaluated to non-nil."
(symbolp (cdr local-condition)))
(cdr local-condition)
nil)))
(multiple-value-bind (key start end) (yas/current-key)
(let ((templates (yas/snippet-table-fetch (yas/current-snippet-table)
key)))
(if templates
(let ((template (if (null (cdr templates)) ; only 1 template
(yas/template-content (cdar templates))
(yas/popup-for-template templates))))
(when template
(yas/expand-snippet start end template)))
(let* ((yas/minor-mode nil)
(command (key-binding yas/trigger-key)))
(when (commandp command)
(call-interactively command))))))))))
(multiple-value-bind (templates start end) (yas/current-key)
(if templates
(let ((template (if (null (cdr templates)) ; only 1 template
(yas/template-content (cdar templates))
(yas/popup-for-template templates))))
(when template
(yas/expand-snippet start end template)))
(let* ((yas/minor-mode nil)
(command (key-binding yas/trigger-key)))
(when (commandp command)
(call-interactively command)))))))))
(defun yas/next-field-group ()
"Navigate to next field group. If there's none, exit the snippet."