]> code.delx.au - gnu-emacs-elpa/commitdiff
bugfix: error in `yas/add-template` when `omit-items` was used in `yas/define-menu`
authorJoão Távora <joaotavora@gmail.com>
Wed, 27 Jun 2012 16:04:17 +0000 (17:04 +0100)
committerJoão Távora <joaotavora@gmail.com>
Wed, 27 Jun 2012 16:04:17 +0000 (17:04 +0100)
yasnippet.el

index 94255f342bd018f411cd06b4e038369da904e8a1..30b6c0cac6c8fd480692b76e4b0bf047a8adcdef 100644 (file)
@@ -1078,9 +1078,10 @@ keybinding)."
 
     ;; Update trigger & keybinding in the menu-binding pair
     ;;
-    (setf (getf (cdr (car menu-binding-pair)) :keys)
-          (or (and keybinding (key-description keybinding))
-              (and key (concat key yas/trigger-symbol))))
+    (unless (eq (cdr menu-binding-pair) :none)
+      (setf (getf (cdr (car menu-binding-pair)) :keys)
+            (or (and keybinding (key-description keybinding))
+                (and key (concat key yas/trigger-symbol)))))
 
     (puthash (yas/template-uuid template) template (yas/table-uuidhash table))))