]> code.delx.au - gnu-emacs-elpa/commitdiff
Don't "adjust key" (#422)
authorDmitry Gutov <dgutov@yandex.ru>
Sun, 29 Nov 2015 14:27:57 +0000 (16:27 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Sun, 29 Nov 2015 14:27:57 +0000 (16:27 +0200)
company-yasnippet.el

index 37970b069a5c9fc7b6dfc71b6f68d0ec66355b41..8dac5e9a7134be84de9533453b5d41f96d9383ef 100644 (file)
@@ -84,7 +84,7 @@
               (maphash
                (lambda (name template)
                  (push
-                  (propertize (company-yasnippet--adjust-key key prefix key-prefix)
+                  (propertize key
                               'yas-annotation name
                               'yas-template template
                               'yas-prefix-offset (- (length key-prefix)
        res))
    tables))
 
-(defun company-yasnippet--adjust-key (key prefix key-prefix)
-  (let ((pl (length prefix))
-        (kpl (length key-prefix)))
-    (cond
-     ((= pl kpl)
-      key)
-     ((> pl kpl)
-      (concat (substring prefix 0 (- pl kpl)) key))
-     (t
-      (substring key (- kpl pl))))))
-
 ;;;###autoload
 (defun company-yasnippet (command &optional arg &rest ignore)
   "`company-mode' backend for `yasnippet'.