branch: externals/yasnippet
commit eb5ba2664c3a68ae4a53bb38b85418dd131b208f
Merge: 33587a8551 e23a80177a
Author: monnier <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1196 from VitoVan/master
(yas--all-parents): delete-dups for fundamental-mode
---
yasnippet.el | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index fa36be7089..0d52a96ecc 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -848,18 +848,19 @@ which decides on the snippet to expand.")
(cons (if (eq mode 'fundamental-mode) ()
(append (cdr ap) '(fundamental-mode)))
extras))))
- (cons mode
- (yas--merge-ordered-lists
- (mapcar #'yas--all-parents
- (remq nil
- `(,(or (get mode 'derived-mode-parent)
- ;; Consider `fundamental-mode'
- ;; as ultimate ancestor.
- 'fundamental-mode)
- ,(let ((alias (symbol-function mode)))
- (when (symbolp alias) alias))
- ,@(get mode
'derived-mode-extra-parents)
- ,@(gethash mode yas--parents)))))))))
+ (delete-dups
+ (cons mode
+ (yas--merge-ordered-lists
+ (mapcar #'yas--all-parents
+ (remq nil
+ `(,(or (get mode 'derived-mode-parent)
+ ;; Consider `fundamental-mode'
+ ;; as ultimate ancestor.
+ 'fundamental-mode)
+ ,(let ((alias (symbol-function mode)))
+ (when (symbolp alias) alias))
+ ,@(get mode
'derived-mode-extra-parents)
+ ,@(gethash mode yas--parents))))))))))
(dolist (parent all-parents)
(cl-pushnew mode (get parent 'yas--cached-children)))
(put mode 'yas--all-parents all-parents)))))
