[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ca04f69 39/63: Make `yas-about' more informative
From: |
Noam Postavsky |
Subject: |
[elpa] master ca04f69 39/63: Make `yas-about' more informative |
Date: |
Mon, 17 Jul 2017 22:54:16 -0400 (EDT) |
branch: master
commit ca04f69c101cff4fd6e71a4c1642e3a169a0057b
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Make `yas-about' more informative
* yasnippet.el (yas--loaddir): New constant.
(yas-installed-snippets-dir): Use it to compute value.
(yas-about): Get version from git or `package' if available.
---
yasnippet.el | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index 47b8ff5..9934b4d 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -152,10 +152,13 @@
:prefix "yas-"
:group 'editing)
+(defconst yas--loaddir
+ (file-name-directory (or load-file-name buffer-file-name))
+ "Directory that yasnippet was loaded from.")
+
(defvar yas-installed-snippets-dir nil)
(setq yas-installed-snippets-dir
- (when load-file-name
- (expand-file-name "snippets" (file-name-directory load-file-name))))
+ (expand-file-name "snippets" yas--loaddir))
(defconst yas--default-user-snippets-dir
(expand-file-name "snippets" user-emacs-directory))
@@ -1977,9 +1980,21 @@ This works by stubbing a few functions, then calling
(defun yas-about ()
(interactive)
- (message (concat "yasnippet (version "
- yas--version
- ") -- pluskid/joaotavora/npostavs")))
+ (message "yasnippet (version %s) -- pluskid/joaotavora/npostavs"
+ (or (ignore-errors (car (let ((default-directory yas--loaddir))
+ (process-lines "git" "describe"
+ "--tags" "--dirty"))))
+ (when (and (featurep 'package) (fboundp 'package-desc-version))
+ (ignore-errors
+ (let* ((yas-pkg (cdr (assq 'yasnippet package-alist)))
+ (version (package-version-join
+ (package-desc-version (car yas-pkg)))))
+ ;; Special case for MELPA's bogus version numbers.
+ (if (string-match
"\\`20..[01][0-9][0-3][0-9][.][0-9]\\{3,4\\}\\'"
+ version)
+ (concat yas--version "-snapshot" version)
+ version))))
+ yas--version)))
;;; Apropos snippet menu:
- [elpa] master 1043b6c 49/63: Restore syntax-propertize-function before indenting mirrors, (continued)
- [elpa] master 1043b6c 49/63: Restore syntax-propertize-function before indenting mirrors, Noam Postavsky, 2017/07/17
- [elpa] master 65952e3 53/63: Allow customizing overlay priority, Noam Postavsky, 2017/07/17
- [elpa] master 1a860bd 51/63: Fix undo information recording for multiline snippets, Noam Postavsky, 2017/07/17
- [elpa] master 22eeb1e 36/63: Fix interaction with c auto-fill, Noam Postavsky, 2017/07/17
- [elpa] master 0311fe2 15/63: Use :filter instead of yas--fallback, Noam Postavsky, 2017/07/17
- [elpa] master 1babe81 40/63: * yasnippet.el (yas-about): Fix compile warnings in previous commit., Noam Postavsky, 2017/07/17
- [elpa] master 2f5cb2e 56/63: Make yas-debug-process-command-line easier to debug, Noam Postavsky, 2017/07/17
- [elpa] master 164acd6 59/63: * yasnippet-debug.el (yas-debug-snippet): Show modified flag., Noam Postavsky, 2017/07/17
- [elpa] master 7b03ac2 57/63: Handle dead snippets better, Noam Postavsky, 2017/07/17
- [elpa] master 75cbf72 62/63: Update NEWS, version number to 0.12, and snippets submodule, Noam Postavsky, 2017/07/17
- [elpa] master ca04f69 39/63: Make `yas-about' more informative,
Noam Postavsky <=
- [elpa] master c98672e 54/63: Fixup yasnippet-debug.el, Noam Postavsky, 2017/07/17
- [elpa] master 1436d21 60/63: ; Merge yasnippet-debug.el updates, Noam Postavsky, 2017/07/17
- [elpa] master 3fd07de 63/63: * packages/yasnippet: Merge version 0.12.0 from upstream., Noam Postavsky, 2017/07/17