Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update yasnippet and get it from melpa

  • Loading branch information...
commit 98ddde2a17b1d0c6181891561bc01aaf570376ae 1 parent 85b0364
@magnars authored
View
3  .gitmodules
@@ -13,9 +13,6 @@
[submodule "site-lisp/buster-snippets"]
path = site-lisp/buster-snippets
url = https://github.com/magnars/buster-snippets.el.git
-[submodule "site-lisp/yasnippet"]
- path = site-lisp/yasnippet
- url = https://github.com/capitaomorte/yasnippet.git
[submodule "site-lisp/expand-region"]
path = site-lisp/expand-region
url = https://github.com/magnars/expand-region.el.git
View
2  .mc-lists.el
@@ -127,7 +127,7 @@
transpose-sexps
wrap-region-trigger
yank-indented
- yas/expand
+ yas-expand
zap-up-to-char
))
View
2  appearance.el
@@ -63,7 +63,7 @@
;; Unclutter the modeline
(require 'diminish)
-(eval-after-load "yasnippet" '(diminish 'yas/minor-mode))
+(eval-after-load "yasnippet" '(diminish 'yas-minor-mode))
(eval-after-load "eldoc" '(diminish 'eldoc-mode))
(eval-after-load "paredit" '(diminish 'paredit-mode))
(eval-after-load "tagedit" '(diminish 'tagedit-mode))
View
6 custom.el
@@ -3,7 +3,7 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(custom-safe-themes (quote ("c03d60937e814932cd707a487676875457e0b564a615c1edfd453f23b06fe879" "f3ec2da81c2b1f66f911fe47843a09055754b40fafaddcce79bbd4d781161329" "30c6aef3025cd6f05ccb611ec8838a448a14a6784987ed98b24f78916d63b388" "84ff07913c6109d12bfda40644daeaaa8f4665afb5f04e13e422bd98b02ee88b" "cf33119622dd833e4d8f904f34c5e3ff95d1d3d45bada72dd44648b3470bdebe" "f5776f3da6117901f29405fe52edb2bcba6a687629b4cbd5923d1a642484f2f9" "d56e289b10204629ac5c35b9621a650a534ef3baf183a1c601b4936482321df1" "50ceca952b37826e860867d939f879921fac3f2032d8767d646dd4139564c68a" "ff73e1b0216feca9e041dcb3196938442cc6aa8319f97eedbc2a3e38c8ca9825" "a18dd0a954ac63a80e62c8cb1b550ffcf5d8461189c7c672555faadf2facfcf3" "cb36f8e44d41595010baa23737984c4ecb2d8cc2e363ec15fbfa0408c2f8ea9f" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "9f42bccce1e13fa5017eb8718574db099e85358b9f424db78e7318f86d1be08f" default)))
+ '(custom-safe-themes (quote ("9527feeeec43970b1d725bdc04e97eb2b03b15be982ac50089ad223d3c6f2920" "c03d60937e814932cd707a487676875457e0b564a615c1edfd453f23b06fe879" "f3ec2da81c2b1f66f911fe47843a09055754b40fafaddcce79bbd4d781161329" "30c6aef3025cd6f05ccb611ec8838a448a14a6784987ed98b24f78916d63b388" "84ff07913c6109d12bfda40644daeaaa8f4665afb5f04e13e422bd98b02ee88b" "cf33119622dd833e4d8f904f34c5e3ff95d1d3d45bada72dd44648b3470bdebe" "f5776f3da6117901f29405fe52edb2bcba6a687629b4cbd5923d1a642484f2f9" "d56e289b10204629ac5c35b9621a650a534ef3baf183a1c601b4936482321df1" "50ceca952b37826e860867d939f879921fac3f2032d8767d646dd4139564c68a" "ff73e1b0216feca9e041dcb3196938442cc6aa8319f97eedbc2a3e38c8ca9825" "a18dd0a954ac63a80e62c8cb1b550ffcf5d8461189c7c672555faadf2facfcf3" "cb36f8e44d41595010baa23737984c4ecb2d8cc2e363ec15fbfa0408c2f8ea9f" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "9f42bccce1e13fa5017eb8718574db099e85358b9f424db78e7318f86d1be08f" default)))
'(ido-use-filename-at-point nil)
'(safe-local-variable-values (quote ((eval font-lock-add-keywords nil (quote (("defexamples\\|def-example-group\\| => " (0 (quote font-lock-keyword-face)))))) (eval when (and (buffer-file-name) (file-regular-p (buffer-file-name)) (string-match-p "^[^.]" (buffer-file-name))) (emacs-lisp-mode)) (eval font-lock-add-keywords nil (quote (("defexamples\\| => " (0 (quote font-lock-keyword-face)))))) (encoding . utf-8)))))
@@ -12,5 +12,5 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(js2-error-face ((t nil)))
- '(js2-warning-face ((t nil))))
+ '(js2-error-face ((t nil)) t)
+ '(js2-warning-face ((t nil)) t))
View
1  init.el
@@ -63,6 +63,7 @@
flycheck
flx
flx-ido
+ yasnippet
smartparens
ido-vertical-mode
ido-at-point
View
2  mode-mappings.el
@@ -85,7 +85,7 @@
(autoload 'markdown-mode "markdown-mode")
(add-to-list 'auto-mode-alist '("\\.md$" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.markdown$" . markdown-mode))
-(add-hook 'markdown-mode-hook (lambda () (define-key markdown-mode-map (kbd "<tab>") 'yas/expand)))
+(add-hook 'markdown-mode-hook (lambda () (define-key markdown-mode-map (kbd "<tab>") 'yas-expand)))
;; org-mode
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
View
2  project-archetypes/emacs-snippets/__target__-snippets.el
@@ -61,7 +61,7 @@
(let ((snip-dir (expand-file-name "snippets" __target__-snippets-root)))
(when (boundp 'yas-snippet-dirs)
(add-to-list 'yas-snippet-dirs snip-dir t))
- (yas/load-directory snip-dir)))
+ (yas-load-directory snip-dir)))
;;;###autoload
(eval-after-load "yasnippet"
View
2  setup-html-mode.el
@@ -27,7 +27,7 @@
(defun --setup-simplezen ()
(require 'simplezen)
- (set (make-local-variable 'yas/fallback-behavior)
+ (set (make-local-variable 'yas-fallback-behavior)
'(apply simplezen-expand-or-indent-for-tab)))
(add-hook 'sgml-mode-hook '--setup-simplezen)
View
4 setup-ido.el
@@ -71,7 +71,7 @@
ad-do-it))))
(ido-ubiquitous-use-new-completing-read webjump 'webjump)
-(ido-ubiquitous-use-new-completing-read yas/expand 'yasnippet)
-(ido-ubiquitous-use-new-completing-read yas/visit-snippet-file 'yasnippet)
+(ido-ubiquitous-use-new-completing-read yas-expand 'yasnippet)
+(ido-ubiquitous-use-new-completing-read yas-visit-snippet-file 'yasnippet)
(provide 'setup-ido)
View
4 setup-js2-mode.el
@@ -138,8 +138,8 @@
;; js2-mode steals TAB, let's steal it back for yasnippet
(defun js2-tab-properly ()
(interactive)
- (let ((yas/fallback-behavior 'return-nil))
- (unless (yas/expand)
+ (let ((yas-fallback-behavior 'return-nil))
+ (unless (yas-expand)
(indent-for-tab-command)
(if (looking-back "^\s*")
(back-to-indentation)))))
View
24 setup-yasnippet.el
@@ -1,8 +1,8 @@
(require 'yasnippet)
;; Use only own snippets, do not use bundled ones
-(setq yas/snippet-dirs '("~/.emacs.d/snippets"))
-(yas/global-mode 1)
+(setq yas-snippet-dirs '("~/.emacs.d/snippets"))
+(yas-global-mode 1)
;; Include snippets for stuff
(require 'buster-snippets)
@@ -10,35 +10,35 @@
(require 'datomic-snippets)
;; Jump to end of snippet definition
-(define-key yas/keymap (kbd "<return>") 'yas/exit-all-snippets)
+(define-key yas-keymap (kbd "<return>") 'yas/exit-all-snippets)
;; Inter-field navigation
(defun yas/goto-end-of-active-field ()
(interactive)
- (let* ((snippet (car (yas/snippets-at-point)))
- (position (yas/field-end (yas/snippet-active-field snippet))))
+ (let* ((snippet (car (yas--snippets-at-point)))
+ (position (yas--field-end (yas--snippet-active-field snippet))))
(if (= (point) position)
(move-end-of-line 1)
(goto-char position))))
(defun yas/goto-start-of-active-field ()
(interactive)
- (let* ((snippet (car (yas/snippets-at-point)))
- (position (yas/field-start (yas/snippet-active-field snippet))))
+ (let* ((snippet (car (yas--snippets-at-point)))
+ (position (yas--field-start (yas--snippet-active-field snippet))))
(if (= (point) position)
(move-beginning-of-line 1)
(goto-char position))))
-(define-key yas/keymap (kbd "C-e") 'yas/goto-end-of-active-field)
-(define-key yas/keymap (kbd "C-a") 'yas/goto-start-of-active-field)
+(define-key yas-keymap (kbd "C-e") 'yas/goto-end-of-active-field)
+(define-key yas-keymap (kbd "C-a") 'yas/goto-start-of-active-field)
;; No dropdowns please, yas
-(setq yas/prompt-functions '(yas/ido-prompt yas/completing-prompt))
+(setq yas-prompt-functions '(yas/ido-prompt yas/completing-prompt))
;; No need to be so verbose
-(setq yas/verbosity 1)
+(setq yas-verbosity 1)
;; Wrap around region
-(setq yas/wrap-around-region t)
+(setq yas-wrap-around-region t)
(provide 'setup-yasnippet)
1  site-lisp/yasnippet
@@ -1 +0,0 @@
-Subproject commit bbef0374830309b5983ba1ae062cb8ec6772d02c
View
2  themes/default-black-theme.el
@@ -7,7 +7,7 @@
'(highlight ((((class color) (min-colors 88) (background dark)) (:background "#111111"))))
'(region ((nil (:background "#464740"))))
'(hl-line ((nil (:background "#222222"))))
- '(yas/field-highlight-face ((nil (:background "#333399"))))
+ '(yas-field-highlight-face ((nil (:background "#333399"))))
'(js2-function-param-face ((t (:foreground "LightGoldenrod"))))
'(font-lock-warning-face ((nil (:foreground "#ff6666"))))
'(show-paren-match ((nil (:background "#333399"))))
Please sign in to comment.
Something went wrong with that request. Please try again.