Merge branch 'jit-loading', implementing #160.

[gnu-emacs-elpa] / yasnippet.el

diff --git a/yasnippet.el b/yasnippet.el
index 677353ad9e97f0ba25a6a734b8e4462c14bbd8ba..23348a8e782a9cd7961fa6204f022392614f7300 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -779,7 +779,7 @@ and friends."
 (define-minor-mode yas/minor-mode
   "Toggle YASnippet mode.
 
-When YASnippet mode is enabled, the `tas/trigger-key' key expands
+When YASnippet mode is enabled, the `yas/trigger-key' key expands
 snippets of code depending on the mode.
 
 With no argument, this command toggles the mode.
@@ -1702,6 +1702,9 @@ Below TOP-LEVEL-DIR each directory is a mode name."
     ;; Reload the direct keybindings
     ;;
     (yas/direct-keymaps-reload)
+    ;; Reload the trigger-key (shoudn't be needed, but see issue #237)
+    ;; 
+    (yas/trigger-key-reload)
     (yas/message 3 "Reloaded everything...%s." (if errors " (some errors, check *Messages*)" ""))))
 
 (defun yas/load-pending-jits ()