Merge branch 'master' into jit-loading

Minor conflicts (had already corrected spelling on some log lines...):
	yasnippet.el

diff --cc yasnippet.el
index 99ba1092d26518dab8c5e7a9388e1c3f505cd48d,f0aaaeb2403180cbc18decca474b4bbbaa5f3794..93566fbccb6fe30dbb64d37915e4b6746e8189a4
--- 1/yasnippet.el
--- 2/yasnippet.el
+++ b/yasnippet.el
@@@ -1644,19 -1644,13 +1643,19 @@@ Below TOP-LEVEL-DIR., each directory i
    (unless yas/snippet-dirs
      (setq yas/snippet-dirs top-level-dir))
    (dolist (dir (yas/subdirs top-level-dir))
 -    (let ((major-mode-and-parents (yas/compute-major-mode-and-parents
 -                                   (concat dir "/dummy"))))
 -      (yas/load-directory-1 dir
 -                            (car major-mode-and-parents)
 -                            (cdr major-mode-and-parents))))
 +    (let* ((major-mode-and-parents (yas/compute-major-mode-and-parents
 +                                    (concat dir "/dummy")))
 +           (mode-sym (car major-mode-and-parents))
 +           (parents (cdr major-mode-and-parents)))
 +      (puthash mode-sym (remove-duplicates
 +                         (append parents
 +                                 (gethash mode-sym yas/parents)))
 +               yas/parents)
 +      (yas/schedule-jit mode-sym
 +                        `(yas/load-directory-1 ,dir
 +                                               ',mode-sym))))
    (when (interactive-p)
-     (message "[yas] Loaded snippets from %s." top-level-dir)))
+     (yas/message 3 "Loaded snippets from %s." top-level-dir)))
  
  (defun yas/load-snippet-dirs ()
    "Reload the directories listed in `yas/snippet-dirs' or
@@@ -1979,7 -1979,7 +1978,7 @@@ ommited from MODE's menu, even if they'
             (define-key keymap (vector (gensym))
               '(menu-item "----")))
            (t
-            (message "[yas] Don't know anything about menu entry %s" (first e))))))
 -           (yas/message 3 "don't know anything about menu entry %s" (first e))))))
++           (yas/message 3 "Don't know anything about menu entry %s" (first e))))))
  
  (defun yas/define (mode key template &optional name condition group)
    "Define a snippet.  Expanding KEY into TEMPLATE.
@@@ -2996,7 -2996,7 +2995,7 @@@ snippet as ordinary text.
        ;; again from `yas/take-care-of-redo'....
        (setf (yas/snippet-fields snippet) nil)))
  
-   (message "[yas] Snippet %s exited." (yas/snippet-id snippet)))
 -  (yas/message 3 "snippet %s exited." (yas/snippet-id snippet)))
++  (yas/message 3 "Snippet %s exited." (yas/snippet-id snippet)))
  
  (defun yas/safely-run-hooks (hook-var)
    (condition-case error
@@@ -3685,7 -3685,7 +3684,7 @@@ SNIPPET-MARKERS.
        (widen)
        (condition-case err
            (indent-according-to-mode)
-         (error (message "[yas] warning: `yas/indent-according-to-mode' having problems running %s" indent-line-function)
 -        (error (yas/message 3 "warning: yas/indent-according-to-mode habing problems running %s" indent-line-function)
++        (error (yas/message 3 "Warning: `yas/indent-according-to-mode' having problems running %s" indent-line-function)
                 nil)))
      (mapc #'(lambda (marker)
                (set-marker marker (point)))
@@@ -4028,7 -4028,7 +4027,7 @@@ that the rest of `yas/post-command-hand
                    (apply (car fn-and-args)
                           (cdr fn-and-args)))
                yas/post-command-runonce-actions)
-       (error (message "[yas] Problem running `yas/post-command-runonce-actions'!")))
 -      (error (yas/message 3 "problem running `yas/post-command-runonce-actions'!")))
++      (error (yas/message 3 "Problem running `yas/post-command-runonce-actions'!")))
      (setq yas/post-command-runonce-actions nil))
    (cond (yas/protection-violation
           (goto-char yas/protection-violation)