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

refactor: snippet--[open|close]-markers take objects not markers

Browse Source
This commit is contained in:
Joao Tavora 2013-10-19 01:17:27 +01:00
parent 62c40c50b9
commit 67ddacd916
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
snippet.el
View File

@ -420,26 +420,26 @@ can be:
(set-marker-insertion-type marker t)
(set-marker marker (point))))
(defun snippet--open-markers (start end)
(set-marker-insertion-type start nil)
(set-marker-insertion-type end t))
(defun snippet--open-markers (object)
(set-marker-insertion-type (snippet--object-start object) nil)
(set-marker-insertion-type (snippet--object-end object) t))
(defun snippet--close-markers (start end)
(cond ((= start end)
(set-marker-insertion-type start t)
(set-marker-insertion-type end t))
(t
(set-marker-insertion-type start t)
(set-marker-insertion-type end nil))))
(defun snippet--close-markers (object)
(let ((start (snippet--object-start object))
(end (snippet--object-end object)))
(cond ((= start end)
(set-marker-insertion-type start t)
(set-marker-insertion-type end t))
(t
(set-marker-insertion-type start t)
(set-marker-insertion-type end nil)))))
(defun snippet--call-with-current-object (object fn)
(let* ((start (snippet--object-start object))
(end (snippet--object-end object)))
(unwind-protect
(progn
(snippet--open-markers start end)
(funcall fn))
(snippet--close-markers start end))))
(unwind-protect
(progn
(snippet--open-markers object)
(funcall fn))
(snippet--close-markers object)))
(defmacro snippet--with-current-object (object &rest body)
(declare (indent defun) (debug t))
@ -474,15 +474,13 @@ can be:
(let* ((field (overlay-get overlay 'snippet--field))
(inhibit-modification-hooks t))
(cond (after?
(snippet--close-markers (snippet--object-start field)
(snippet--object-end field))
(snippet--close-markers field)
(mapc #'snippet--update-mirror (snippet--field-mirrors field))
(move-overlay overlay
(snippet--object-start field)
(snippet--object-end field)))
(t
(snippet--open-markers (snippet--object-start field)
(snippet--object-end field))))))
(snippet--open-markers field)))))
(defun snippet--field-text (field)
(buffer-substring-no-properties (snippet--object-start field)