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

Consider fundamental-mode as ultimate ancestor

Browse Source 
* yasnippet.el (yas--modes-to-activate): If a mode doesn't have a
`derived-mode-parent' property, use `fundamental-mode'.
* yasnippet-tests.el (loading-with-cyclic-parenthood)
(issue-492-and-494): Expect fundamental-mode to be active.
* doc/snippet-expansion.org (Eligible snippets): Mention that
fundamental-mode is a fallback parent mode.
This commit is contained in:
Noam Postavsky 2018-08-17 20:10:37 -04:00
parent 760f77afb9
commit 845222774b
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/snippet-expansion.org
View File

@ -163,9 +163,11 @@ In particular, the following things matter:
- Parent tables - Parent tables
Snippet tables defined as the parent of some other eligible table are Snippet tables defined as the parent of some other eligible table
also considered. This works recursively, i.e. parents of parents of are also considered. This works recursively, i.e., parents of
eligible tables are also considered. parents of eligible tables are also considered. As a special case,
if a mode doesn't have a parent, then =fundamental-mode= is
considered to be its parent.
- Buffer-local list of extra modes - Buffer-local list of extra modes

6
yasnippet-tests.el
View File

@ -1260,7 +1260,8 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
(yas-reload-all) (yas-reload-all)
(with-temp-buffer (with-temp-buffer
(let* ((major-mode 'c-mode) (let* ((major-mode 'c-mode)
(expected `(c-mode (expected `(fundamental-mode
c-mode
cc-mode cc-mode
yet-another-c-mode yet-another-c-mode
and-also-this-one and-also-this-one
@ -1313,7 +1314,8 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \
(yas-reload-all) (yas-reload-all)
(with-temp-buffer (with-temp-buffer
(let* ((major-mode 'yas--test-mode) (let* ((major-mode 'yas--test-mode)
(expected `(c-mode (expected `(fundamental-mode
c-mode
,@(if (fboundp 'prog-mode) ,@(if (fboundp 'prog-mode)
'(prog-mode)) '(prog-mode))
yas--phony-c-mode yas--phony-c-mode

5
yasnippet.el
View File

@ -801,7 +801,10 @@ which decides on the snippet to expand.")
(yas--dfs (yas--dfs
(lambda (mode) (lambda (mode)
(cl-loop for neighbour (cl-loop for neighbour
in (cl-list* (get mode 'derived-mode-parent) in (cl-list* (or (get mode 'derived-mode-parent)
;; Consider `fundamental-mode'
;; as ultimate ancestor.
'fundamental-mode)
;; NOTE: `fboundp' check is redundant ;; NOTE: `fboundp' check is redundant
;; since Emacs 24.4. ;; since Emacs 24.4.
(and (fboundp mode) (symbol-function mode)) (and (fboundp mode) (symbol-function mode))