bug fix: failed to recognize user customized yas/trigger-key

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 380b98e5fb90a7e01c576a4ea3a6cab6e435e09d..41131c15912b9d9fb8768381fd2eead960b7958b 100644 (file)
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,11 @@ ChangeLog
 :Contact: pluskid@gmail.com
 :Date: 2008-03-22
 
+0.4.3 / 2008-03-23
+==================
+
+* Bug fix: failed to recognize user customized yas/trigger-key.
+
 0.4.2 / 2008-03-22
 ==================
 

diff --git a/yasnippet.el b/yasnippet.el
index 4d0b0fcded41b6217f14a40fcd72f4b4a4463abd..c447f60a0392a80bc241f9bf2f2739ce12f742e7 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3,7 +3,7 @@
 ;; Copyright 2008 pluskid
 ;; 
 ;; Author: pluskid <pluskid@gmail.com>
-;; Version: 0.4.2
+;; Version: 0.4.3
 ;; X-URL: http://code.google.com/p/yasnippet/
 
 ;; This file is free software; you can redistribute it and/or modify
@@ -159,7 +159,7 @@ Here's an example:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal variables
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defvar yas/version "0.4.2")
+(defvar yas/version "0.4.3")
 
 (defvar yas/snippet-tables (make-hash-table)
   "A hash table of snippet tables corresponding to each major-mode.")
@@ -214,7 +214,6 @@ Here's an example:
   "Hook to call when yas/minor-mode is on.")
 (defvar yas/minor-mode-off-hook nil
   "Hook to call when yas/minor-mode is off.")
-(define-key yas/minor-mode-map yas/trigger-key 'yas/expand)
 (define-minor-mode yas/minor-mode
   "Toggle YASnippet mode.
 With no argument, this command toggles the mode.
@@ -229,7 +228,8 @@ You can customize the key through `yas/trigger-key'."
   nil
   ;; The indicator for the mode line.
   " yas"
-  :group 'editing)
+  :group 'editing
+  (define-key yas/minor-mode-map yas/trigger-key 'yas/expand))
 
 (defun yas/minor-mode-on ()
   "Turn on YASnippet minor mode."