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

yasnippet.el (yas--version): Delete variable.

Browse Source 
(yas-about): Fall back to the Git description only if the package
version is not available.
(yas--make-menu-binding): Don't quote lambdas.
This commit is contained in:
Stefan Monnier 2025-04-03 15:26:13 -04:00
parent 81a59d1a85
commit 2384fe1655
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
yasnippet.el
View File

@ -588,8 +588,6 @@ can be useful."
;;; Internal variables
(defconst yas--version "0.14.0")
(defvar yas--menu-table (make-hash-table)
"A hash table of MAJOR-MODE symbols to menu keymaps.")
@ -1672,8 +1670,9 @@ Here's a list of currently recognized directives:
(directory-files directory t)))
(defun yas--make-menu-binding (template)
(let ((mode (yas--table-mode (yas--template-table template))))
`(lambda () (interactive) (yas--expand-or-visit-from-menu ',mode ,(yas--template-uuid template)))))
(let ((mode (yas--table-mode (yas--template-table template)))
(uuid (yas--template-uuid template)))
(lambda () (interactive) (yas--expand-or-visit-from-menu mode uuid))))
(defun yas--expand-or-visit-from-menu (mode uuid)
(let* ((table (yas--table-get-create mode))
@ -2120,27 +2119,23 @@ This works by stubbing a few functions, then calling
(defun yas-about ()
(interactive)
(message "yasnippet (version %s) -- pluskid/joaotavora/npostavs"
(or (ignore-errors (car (let ((default-directory yas--loaddir))
(process-lines "git" "describe"
"--tags" "--dirty"))))
(eval-when-compile
(or (eval-when-compile
(and (fboundp 'package-get-version)
(package-get-version)))
(when (and (featurep 'package)
(when (and (boundp 'package-alist)
(fboundp 'package-desc-version)
(fboundp 'package-version-join))
(defvar package-alist)
(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)))
(let* ((yas-pkg (cdr (assq 'yasnippet package-alist))))
(when yas-pkg
(package-version-join
(package-desc-version (car yas-pkg)))))))
;; The Git description can be misleading, for lack of
;; recent tags, so we prefer package version info.
(ignore-errors (car (let ((default-directory yas--loaddir))
(process-lines "git" "describe"
"--tags" "--dirty"))))
"unknown")))
;;; Apropos snippet menu:
;;