From: Dmitry Gutov Date: Tue, 3 Nov 2015 10:30:17 +0000 (+0300) Subject: Merge pull request #418 from PythonNut/master X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/c656b25f9e987799bf6b07df761561fb96dda6c2?hp=33f7bbcfc5e5bea982e2a408c4048162936c365f Merge pull request #418 from PythonNut/master Allow advising company-dabbrev(-code)? regex generation --- diff --git a/company-dabbrev-code.el b/company-dabbrev-code.el index dcfe6ab53..cbe8d3f96 100644 --- a/company-dabbrev-code.el +++ b/company-dabbrev-code.el @@ -69,7 +69,7 @@ also `company-dabbrev-code-time-limit'." "Non-nil to ignore case when collecting completion candidates." :type 'boolean) -(defsubst company-dabbrev-code--make-regexp (prefix) +(defun company-dabbrev-code--make-regexp (prefix) (concat "\\_<" (if (equal prefix "") "\\([a-zA-Z]\\|\\s_\\)" (regexp-quote prefix)) diff --git a/company-dabbrev.el b/company-dabbrev.el index 6f90c16a9..ab532516a 100644 --- a/company-dabbrev.el +++ b/company-dabbrev.el @@ -91,7 +91,7 @@ This variable affects both `company-dabbrev' and `company-dabbrev-code'." (> (float-time (time-since ,start)) ,limit) (throw 'done 'company-time-out)))))) -(defsubst company-dabbrev--make-regexp (prefix) +(defun company-dabbrev--make-regexp (prefix) (concat "\\<" (if (equal prefix "") company-dabbrev-char-regexp (regexp-quote prefix))