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 dcfe6ab53fba45e4d86519852717ef3059eea322..cbe8d3f96ff845758a048eaca901bfbc2d1210fd 100644 (file)
--- 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 6f90c16a94f3119a257a68fb0bab178bd0297ec5..ab532516a69fe8c477410b50f4eb7c98f5e30163 100644 (file)
--- 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))