Merge remote-tracking branch 'origin/master' into jit-loading

[gnu-emacs-elpa] / yasnippet.el

diff --git a/yasnippet.el b/yasnippet.el
index a9e545ecfa85e76fe8862601c7c5696ea594c4a5..b004ffc8a5437d09535611d27d4de82406ab9448 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -181,6 +181,7 @@ as the default for storing the user's new snippets."
                          (equal old new))
                (yas/reload-all)))))
 (defun yas/snippet-dirs ()
+  "Returns `yas/snippet-dirs' (which see) as a list."
   (if (listp yas/snippet-dirs) yas/snippet-dirs (list yas/snippet-dirs)))
 (defvaralias 'yas/root-directory 'yas/snippet-dirs)
 
@@ -1553,7 +1554,7 @@ TEMPLATES is a list of `yas/template'."
         (keyboard-quit))))
 
 (defun yas/ido-prompt (prompt choices &optional display-fn)
-  (when (featurep 'ido)
+  (when (fboundp 'ido-completing-read)
     (yas/completing-prompt prompt choices display-fn #'ido-completing-read)))
 
 (eval-when-compile (require 'dropdown-list nil t))
@@ -1621,6 +1622,7 @@ Below TOP-LEVEL-DIR each directory is a mode name."
                                     (concat dir "/dummy")))
            (mode-sym (car major-mode-and-parents))
            (parents (cdr major-mode-and-parents)))
+      (yas/define-parents mode-sym parents)
       (let ((form `(yas/load-directory-1 ,dir
                                          ',mode-sym
                                          ',parents)))
@@ -1640,7 +1642,6 @@ Below TOP-LEVEL-DIR each directory is a mode name."
       (yas/load-directory-2 directory mode-sym parents))))
 
 (defun yas/load-directory-2 (directory mode-sym parents)
-  (yas/define-parents mode-sym parents)
   ;; Load .yas-setup.el files wherever we find them
   ;;
   (yas/load-yas-setup-file (expand-file-name ".yas-setup" directory))
@@ -1736,10 +1737,6 @@ This works by stubbing a few functions, then calling
             (when (file-exists-p elfile)
               (insert ";;; .yas-setup.el support file if any:\n;;;\n")
               (insert-file-contents elfile))))
-         (yas/define-parents
-          (mode parents)
-          (insert ";;; Parent definitions:\n;;;\n")
-          (insert (pp-to-string `(yas/define-parents ',mode ',parents))))
          (yas/define-snippets
           (mode snippets)
           (insert ";;; Snippet definitions:\n;;;\n")
@@ -2950,7 +2947,7 @@ Also create some protection overlays"
   (mapc #'(lambda (snippet)
             (yas/exit-snippet snippet)
             (yas/check-commit-snippet))
-        (yas/snippets-at-point)))
+        (yas/snippets-at-point 'all-snippets)))
 
 \f
 ;;; Some low level snippet-routines