[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 01139a2 23/60: * yasnippet.el (yas--define-snippets-2): Us
From: |
João Távora |
Subject: |
[elpa] master 01139a2 23/60: * yasnippet.el (yas--define-snippets-2): Use file-name-NONdirectory. |
Date: |
Thu, 21 Jan 2016 22:35:56 +0000 |
branch: master
commit 01139a2deb9eda272b9b771fbbe15d096061efa4
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
* yasnippet.el (yas--define-snippets-2): Use file-name-NONdirectory.
---
yasnippet.el | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index ff46811..f47bafe 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -926,8 +926,11 @@ Honour `yas-dont-activate', which see."
expand-env load-file xkeybinding xuuid save-file
&aux
(name (or xname
- (and load-file (file-name-directory load-file))
- (and save-file (file-name-directory save-file))
+ ;; A little redundant: we always get a name
+ ;; from `yas--parse-template' except when
+ ;; there isn't a file.
+ (and load-file (file-name-nondirectory load-file))
+ (and save-file (file-name-nondirectory save-file))
key))
(keybinding (yas--read-keybinding xkeybinding))
(uuid (or xuuid name))
- [elpa] master 197db9f 10/60: Merge pull request #578 from aluaces/patch-1, (continued)
- [elpa] master 197db9f 10/60: Merge pull request #578 from aluaces/patch-1, João Távora, 2016/01/21
- [elpa] master 7f4f6be 07/60: Merge pull request #571 from PhilHudson/master, João Távora, 2016/01/21
- [elpa] master c91a588 14/60: Simplify some code, João Távora, 2016/01/21
- [elpa] master 7bce1a6 12/60: Add new function yas-lookup-snippet, João Távora, 2016/01/21
- [elpa] master e8934ce 13/60: Merge pull request #596 from npostavs/lookup-snippet, João Távora, 2016/01/21
- [elpa] master 0ada0fc 15/60: Add documentation for snippet compilation, João Távora, 2016/01/21
- [elpa] master 4bd3d98 16/60: Merge pull request #599 from zmwangx/snippet-compilation-doc, João Távora, 2016/01/21
- [elpa] master 2f6cfef 17/60: Closes #601: updated snippets submodule, João Távora, 2016/01/21
- [elpa] master 68b0ab6 20/60: Accept documented snippet list formats, João Távora, 2016/01/21
- [elpa] master cc1c758 18/60: Reorganize snippet construction from list code, João Távora, 2016/01/21
- [elpa] master 01139a2 23/60: * yasnippet.el (yas--define-snippets-2): Use file-name-NONdirectory.,
João Távora <=
- [elpa] master 8df6a6e 25/60: Fix invalid yas-key-syntaxes element warning, João Távora, 2016/01/21
- [elpa] master 7703a55 24/60: * doc/snippet-organization.org (.yas-skip): Add info., João Távora, 2016/01/21
- [elpa] master 041821a 22/60: * yasnippet-tests.el (string-suffix-p): Define for older Emacsen., João Távora, 2016/01/21
- [elpa] master fb6ec67 29/60: Fix #619; find parents for extra-modes too, João Távora, 2016/01/21
- [elpa] master 710ea4d 26/60: Update snippets module, João Távora, 2016/01/21
- [elpa] master 215ad9b 19/60: Fix #597; use SAVE-FILE to visit compiled snippets, João Távora, 2016/01/21
- [elpa] master e3f03ca 21/60: Test visiting compiled snippets, João Távora, 2016/01/21
- [elpa] master e56aa6f 28/60: Build a single `explored' list., João Távora, 2016/01/21
- [elpa] master b6d924c 31/60: * yasnippet.el (yas--scan-sexps): Use ignore-errors., João Távora, 2016/01/21
- [elpa] master 00b84ce 27/60: Add (failing) yas--modes-to-activate test, João Távora, 2016/01/21