[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 7d4e4aa 074/177: Closes #440: don't use `make-variable-buf
From: |
João Távora |
Subject: |
[elpa] master 7d4e4aa 074/177: Closes #440: don't use `make-variable-buffer-local' for `yas--extra-modes' |
Date: |
Sat, 28 Mar 2015 15:40:59 +0000 |
branch: master
commit 7d4e4aa34c4c1935813e93a74063be812d3de365
Author: Joao Tavora <address@hidden>
Commit: Joao Tavora <address@hidden>
Closes #440: don't use `make-variable-buffer-local' for `yas--extra-modes'
---
yasnippet-tests.el | 38 ++++++++++++++++++--------------------
yasnippet.el | 9 ++++-----
2 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 1d770b4..4e2f1bc 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -605,26 +605,24 @@ TODO: be meaner"
"Given a symbol, `yas-activate-extra-mode' should be able to
add the snippets associated with the given mode."
(with-temp-buffer
- (emacs-lisp-mode)
- (yas-minor-mode-on)
- (yas-activate-extra-mode 'markdown-mode)
- (should (eq 'markdown-mode (car yas--extra-modes)))
- (yas-should-expand '(("_" . "_Text_ ")))
- (yas-should-expand '(("car" . "(car )")))))
-
-(ert-deftest test-yas-deactivate-extra-modes ()
- "Given a symbol, `yas-deactive-extra-mode' should be able to
-remove one of the extra modes that is present in the current
-buffer."
- (with-temp-buffer
- (emacs-lisp-mode)
- (yas-minor-mode-on)
- (yas-activate-extra-mode 'markdown-mode)
- (should (eq 'markdown-mode (car yas--extra-modes)))
- (yas-deactivate-extra-mode 'markdown-mode)
- (should-not (eq 'markdown-mode (car yas--extra-modes)))
- (yas-should-not-expand '("_"))
- (yas-should-expand '(("car" . "(car )")))))
+ (yas-saving-variables
+ (yas-with-snippet-dirs
+ '((".emacs.d/snippets"
+ ("markdown-mode"
+ ("_" . "_Text_ "))
+ ("emacs-lisp-mode"
+ ("car" . "(car )"))))
+ (yas-reload-all)
+ (emacs-lisp-mode)
+ (yas-minor-mode-on)
+ (yas-activate-extra-mode 'markdown-mode)
+ (should (eq 'markdown-mode (car yas--extra-modes)))
+ (yas-should-expand '(("_" . "_Text_ ")))
+ (yas-should-expand '(("car" . "(car )")))
+ (yas-deactivate-extra-mode 'markdown-mode)
+ (should-not (eq 'markdown-mode (car yas--extra-modes)))
+ (yas-should-not-expand '("_"))
+ (yas-should-expand '(("car" . "(car )")))))))
;;; Helpers
diff --git a/yasnippet.el b/yasnippet.el
index cbb4c2b..85715fd 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -778,8 +778,7 @@ activate snippets associated with that mode."
(when (not (string= "" symbol))
(intern symbol)))))
(when mode
- (make-variable-buffer-local 'yas--extra-modes)
- (add-to-list 'yas--extra-modes mode)
+ (add-to-list (make-local-variable 'yas--extra-modes) mode)
(yas--load-pending-jits)))
(defun yas-deactivate-extra-mode (mode)
@@ -788,9 +787,9 @@ activate snippets associated with that mode."
(list (intern
(completing-read
"Deactivate mode: " (mapcar #'list yas--extra-modes) nil t))))
- (setq yas--extra-modes
- (remove mode
- yas--extra-modes)))
+ (set (make-local-variable 'yas--extra-modes)
+ (remove mode
+ yas--extra-modes)))
(defvar yas-dont-activate '(minibufferp)
"If non-nil don't let `yas-global-mode' affect some buffers.
- [elpa] master f86529c 065/177: only crosslink exported symbols, (continued)
- [elpa] master f86529c 065/177: only crosslink exported symbols, João Távora, 2015/03/28
- [elpa] master 0aebb41 055/177: move top heading to title, João Távora, 2015/03/28
- [elpa] master 46c378d 063/177: format args in docstrings as =code=, not /italic/, João Távora, 2015/03/28
- [elpa] master da9852a 053/177: {snippet-development, faq}.org: fixup pandoc output, João Távora, 2015/03/28
- [elpa] master a9e3035 066/177: docstring fixes, João Távora, 2015/03/28
- [elpa] master eda8330 067/177: only /italicize/ words completely in upper case, João Távora, 2015/03/28
- [elpa] master 0f8007e 071/177: Simplify: index.org no longer repeats info in the README, João Távora, 2015/03/28
- [elpa] master 6927f69 069/177: minor: README.mdown link, João Távora, 2015/03/28
- [elpa] master 0a9885e 073/177: markup suffixed variable names, eg SUBEXPth, João Távora, 2015/03/28
- [elpa] master c61f81f 070/177: Closes #439: add a faq question about redefining keys, João Távora, 2015/03/28
- [elpa] master 7d4e4aa 074/177: Closes #440: don't use `make-variable-buffer-local' for `yas--extra-modes',
João Távora <=
- [elpa] master 582e368 072/177: minor: cosmetic fixes to manual, João Távora, 2015/03/28
- [elpa] master 7518cb4 075/177: rake doc:upload: check for wrong/incomplete rev, João Távora, 2015/03/28
- [elpa] master b944cc9 078/177: fix rake doc:upload, João Távora, 2015/03/28
- [elpa] master 90e7595 081/177: yas-text export twice, João Távora, 2015/03/28
- [elpa] master 46b4a02 079/177: doc:upload stylesheets/*.css to gh-pages, João Távora, 2015/03/28
- [elpa] master 6c752a1 080/177: populate yas--exported-syms based on sym prefix, João Távora, 2015/03/28
- [elpa] master ba0b02f 082/177: Merge pull request #446 from dongxiong/patch-2, João Távora, 2015/03/28
- [elpa] master d89e837 076/177: add top level menu, minimal styling, João Távora, 2015/03/28
- [elpa] master 260ecf9 077/177: fix a faq title, João Távora, 2015/03/28
- [elpa] master 0567c93 083/177: Merge pull request #442 from npostavs/auto-export, João Távora, 2015/03/28