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

Merge branch 'master', remote-tracking branch 'origin' into tighter-tab

Browse Source
This commit is contained in:
João Távora 2012-02-27 09:59:54 +00:00
commit 7c6ab3b82e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,6 +3,7 @@ doc/gh-pages
doc/*.html doc/*.html
pkg/ pkg/
extras/imported/** extras/imported/**
!extras/imported/*/.yas_setup.el !extras/imported/*/.yas-setup.el
.yas-compiled-snippets.el
*.elc *.elc

2
README.mdown
View File

@ -29,7 +29,7 @@ Add the following in your `.emacs` file:
(add-to-list 'load-path (add-to-list 'load-path
"~/.emacs.d/plugins/yasnippet") "~/.emacs.d/plugins/yasnippet")
(require 'yasnippet) ;; not yasnippet-bundle (require 'yasnippet)
(yas/global-mode 1) (yas/global-mode 1)
Add your own snippets to `~/.emacs.d/snippets` by placing files there or invoking `yas/new-snippet`. Add your own snippets to `~/.emacs.d/snippets` by placing files there or invoking `yas/new-snippet`.

6
yasnippet.el
View File

@ -1611,9 +1611,9 @@ TEMPLATES is a list of `yas/template'."
(unless (file-exists-p (concat directory "/" ".yas-skip")) (unless (file-exists-p (concat directory "/" ".yas-skip"))
;; Load .yas-setup.el files wherever we find them ;; Load .yas-setup.el files wherever we find them
;; ;;
(load ".yas-setup" 'noerror) (load (expand-file-name ".yas-setup" directory) 'noerror)
(if (and (not no-compiled-snippets) (if (and (not no-compiled-snippets)
(load ".yas-compiled-snippets" 'noerror)) (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror))
(message "Loading much faster .yas-compiled-snippets from %s" directory) (message "Loading much faster .yas-compiled-snippets from %s" directory)
(let* ((major-mode-and-parents (if mode-sym (let* ((major-mode-and-parents (if mode-sym
(cons mode-sym parents) (cons mode-sym parents)
@ -2280,7 +2280,7 @@ where snippets of table might exist."
;; create the .yas-parents file here... ;; create the .yas-parents file here...
candidate))))) candidate)))))
(defun yas/new-snippet (&optional NO-TEMPLATE) (defun yas/new-snippet (&optional no-template)
"Pops a new buffer for writing a snippet. "Pops a new buffer for writing a snippet.
Expands a snippet-writing snippet, unless the optional prefix arg Expands a snippet-writing snippet, unless the optional prefix arg