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: Remove compatibility for Emacs<24.4

Browse Source 
Since we already require Emacs≥24.4, there's not point keeping that
compatibility code.

(yas--modes-to-activate): Remove redundant `fboundp` test.
(yas-activate-extra-mode): Don't bother converting hashtable to alist
to pass to `completing-read`.
(yas-dont-activate-functions): Get rid of Emacs≤23 code.
(snippet-mode): `prog-mode` is always available.
(yas-x-prompt): `posn-at-point` is always available.
(yas--merge-and-drop-dups): `delete-consecutive-dups` is always available.
This commit is contained in:
Stefan Monnier 2024-01-01 19:36:59 -05:00
parent 2b328e563e
commit bcefd0a1c1
1 changed files with 19 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
yasnippet.el
View File

@ -813,13 +813,12 @@ which decides on the snippet to expand.")
(yas--dfs (yas--dfs
(lambda (mode) (lambda (mode)
(cl-loop for neighbour (cl-loop for neighbour
;; FIXME: Use `derived-mode-all-parents'.
in (cl-list* (or (get mode 'derived-mode-parent) in (cl-list* (or (get mode 'derived-mode-parent)
;; Consider `fundamental-mode' ;; Consider `fundamental-mode'
;; as ultimate ancestor. ;; as ultimate ancestor.
'fundamental-mode) 'fundamental-mode)
;; NOTE: `fboundp' check is redundant (symbol-function mode)
;; since Emacs 24.4.
(and (fboundp mode) (symbol-function mode))
(and (boundp 'major-mode-remap-alist) (and (boundp 'major-mode-remap-alist)
(car (rassq mode (car (rassq mode
major-mode-remap-alist))) major-mode-remap-alist)))
@ -892,13 +891,8 @@ Key bindings:
The function can be called in the hook of a minor mode to The function can be called in the hook of a minor mode to
activate snippets associated with that mode." activate snippets associated with that mode."
(interactive (interactive
(let (modes (let ((symbol (completing-read
symbol) "Activate mode: " yas--parents nil t)))
(maphash (lambda (k _)
(setq modes (cons (list k) modes)))
yas--parents)
(setq symbol (completing-read
"Activate mode: " modes nil t))
(list (list
(when (not (string= "" symbol)) (when (not (string= "" symbol))
(intern symbol))))) (intern symbol)))))
@ -926,20 +920,10 @@ activate snippets associated with that mode."
Functions are called with no argument, and should return non-nil to prevent Functions are called with no argument, and should return non-nil to prevent
`yas-global-mode' from enabling yasnippet in this buffer. `yas-global-mode' from enabling yasnippet in this buffer.
In Emacsen < 24, this variable is buffer-local. Because Only the global value is used. To define
`yas-minor-mode-on' is called by `yas-global-mode' after
executing the buffer's major mode hook, setting this variable
there is an effective way to define exceptions to the \"global\"
activation behaviour.
In Emacsen >= 24, only the global value is used. To define
per-mode exceptions to the \"global\" activation behaviour, call per-mode exceptions to the \"global\" activation behaviour, call
`yas-minor-mode' with a negative argument directily in the major `yas-minor-mode' with a negative argument directily in the major
mode's hook.") mode's hook.") ;; FIXME: Why do we say "Only the global value is used"?
(unless (> emacs-major-version 23)
(with-no-warnings
(make-variable-buffer-local 'yas-dont-activate)))
(defun yas-minor-mode-on () (defun yas-minor-mode-on ()
"Turn on YASnippet minor mode. "Turn on YASnippet minor mode.
@ -1006,23 +990,13 @@ Honour `yas-dont-activate-functions', which see."
;;;###autoload(autoload 'snippet-mode "yasnippet" "A mode for editing yasnippets" t nil) ;;;###autoload(autoload 'snippet-mode "yasnippet" "A mode for editing yasnippets" t nil)
(eval-and-compile (define-derived-mode snippet-mode prog-mode "Snippet"
(if (fboundp 'prog-mode) "A mode for editing yasnippets"
;; `prog-mode' is new in 24.1. (setq font-lock-defaults '(yas--font-lock-keywords))
(define-derived-mode snippet-mode prog-mode "Snippet" (set (make-local-variable 'require-final-newline) nil)
"A mode for editing yasnippets" (set (make-local-variable 'comment-start) "#")
(setq font-lock-defaults '(yas--font-lock-keywords)) (set (make-local-variable 'comment-start-skip) "#+[\t ]*")
(set (make-local-variable 'require-final-newline) nil) (add-hook 'after-save-hook #'yas-maybe-load-snippet-buffer nil t))
(set (make-local-variable 'comment-start) "#")
(set (make-local-variable 'comment-start-skip) "#+[\t ]*")
(add-hook 'after-save-hook #'yas-maybe-load-snippet-buffer nil t))
(define-derived-mode snippet-mode fundamental-mode "Snippet"
"A mode for editing yasnippets"
(setq font-lock-defaults '(yas--font-lock-keywords))
(set (make-local-variable 'require-final-newline) nil)
(set (make-local-variable 'comment-start) "#")
(set (make-local-variable 'comment-start-skip) "#+[\t ]*")
(add-hook 'after-save-hook #'yas-maybe-load-snippet-buffer nil t))))
(defun yas-snippet-mode-buffer-p () (defun yas-snippet-mode-buffer-p ()
"Return non-nil if current buffer should be in `snippet-mode'. "Return non-nil if current buffer should be in `snippet-mode'.
@ -1724,12 +1698,10 @@ Optional PROMPT sets the prompt to use."
(redisplay) (redisplay)
(or (or
(x-popup-menu (x-popup-menu
(if (fboundp 'posn-at-point) (let ((x-y (posn-x-y (posn-at-point (point)))))
(let ((x-y (posn-x-y (posn-at-point (point))))) (list (list (+ (car x-y) 10)
(list (list (+ (car x-y) 10) (+ (cdr x-y) 20))
(+ (cdr x-y) 20)) (selected-window)))
(selected-window)))
t)
`(,prompt ("title" `(,prompt ("title"
,@(cl-mapcar (lambda (c d) `(,(concat " " d) . ,c)) ,@(cl-mapcar (lambda (c d) `(,(concat " " d) . ,c))
choices choices
@ -3765,10 +3737,8 @@ BEG, END and LENGTH like overlay modification hooks."
(defun yas--merge-and-drop-dups (list1 list2 cmp key) (defun yas--merge-and-drop-dups (list1 list2 cmp key)
;; `delete-consecutive-dups' + `cl-merge'. ;; `delete-consecutive-dups' + `cl-merge'.
(funcall (if (fboundp 'delete-consecutive-dups) (delete-consecutive-dups
#'delete-consecutive-dups ; 24.4 (cl-merge 'list list1 list2 cmp :key key)))
#'delete-dups)
(cl-merge 'list list1 list2 cmp :key key)))
(defvar yas--before-change-modified-snippets nil) (defvar yas--before-change-modified-snippets nil)
(make-variable-buffer-local 'yas--before-change-modified-snippets) (make-variable-buffer-local 'yas--before-change-modified-snippets)