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

Fixed the error of $> without overlay (Issue 44).

Browse Source
This commit is contained in:
Zhang Chiyuan 2008-12-11 05:44:10 +00:00
parent 28a6515c61
commit 885494084f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
yasnippet.el
View File

@ -782,15 +782,24 @@ will be deleted before inserting template."
,key ,key
,snippet))) ,snippet)))
;; Step 13: remove the trigger key ;; Step 13: Do necessary indenting
(save-excursion
(let ((ovst (overlay-start (yas/snippet-overlay snippet))))
(when ovst
(goto-char ovst)
(while (re-search-forward "$>" nil t)
(replace-match "")
(indent-according-to-mode)))))
;; Step 14: remove the trigger key
(widen) (widen)
(delete-char length) (delete-char length)
;; Step 14: Restore undo information, and also save it for future use. ;; Step 15: Restore undo information, and also save it for future use.
(setf (yas/snippet-saved-buffer-undo-list snippet) original-undo-list) (setf (yas/snippet-saved-buffer-undo-list snippet) original-undo-list)
(setq buffer-undo-list original-undo-list) (setq buffer-undo-list original-undo-list)
;; Step 15: place the cursor at a proper place ;; Step 16: place the cursor at a proper place
(let ((groups (yas/snippet-groups snippet)) (let ((groups (yas/snippet-groups snippet))
(exit-marker (yas/snippet-exit-marker snippet))) (exit-marker (yas/snippet-exit-marker snippet)))
(if groups (if groups
@ -801,14 +810,7 @@ will be deleted before inserting template."
;; no need to call exit-snippet, since no overlay created. ;; no need to call exit-snippet, since no overlay created.
(yas/exit-snippet snippet))) (yas/exit-snippet snippet)))
;; Step 16: Do necessary indenting ))))
(save-excursion
(let ((ovst (overlay-start (yas/snippet-overlay snippet))))
(when ovst
(goto-char ovst)
(while (re-search-forward "$>" nil t)
(replace-match "")
(indent-according-to-mode)))))))))
(defun yas/current-snippet-overlay (&optional point) (defun yas/current-snippet-overlay (&optional point)
"Get the most proper overlay which is belongs to a snippet." "Get the most proper overlay which is belongs to a snippet."