[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c656b25 079/173: Merge pull request #418 from PythonNut/ma
From: |
Dmitry Gutov |
Subject: |
[elpa] master c656b25 079/173: Merge pull request #418 from PythonNut/master |
Date: |
Thu, 23 Jun 2016 00:28:39 +0000 (UTC) |
branch: master
commit c656b25f9e987799bf6b07df761561fb96dda6c2
Merge: 33f7bbc 4646d35
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge pull request #418 from PythonNut/master
Allow advising company-dabbrev(-code)? regex generation
---
company-dabbrev-code.el | 2 +-
company-dabbrev.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/company-dabbrev-code.el b/company-dabbrev-code.el
index dcfe6ab..cbe8d3f 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 6f90c16..ab53251 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))
- [elpa] master 7579ced 055/173: Fix a bug reference, (continued)
- [elpa] master 7579ced 055/173: Fix a bug reference, Dmitry Gutov, 2016/06/22
- [elpa] master 05987e6 056/173: Fix #362 (arbitrary jumping of point), Dmitry Gutov, 2016/06/22
- [elpa] master 679846a 065/173: Makefile: allow package and elpa targets to run without git, Dmitry Gutov, 2016/06/22
- [elpa] master 33f7bbc 077/173: Fix some compilation warnings, Dmitry Gutov, 2016/06/22
- [elpa] master d39b956 059/173: Introduce company-indent-or-complete-common, Dmitry Gutov, 2016/06/22
- [elpa] master 478f124 087/173: company-dabbrev-code-modes: Improve Customize labels, Dmitry Gutov, 2016/06/22
- [elpa] master 4a6eea9 089/173: Use company-dabbrev-char-regexp more consistently (#433), Dmitry Gutov, 2016/06/22
- [elpa] master a3858be 086/173: Ignore trigger key prefixes that are shorter than symbol-at-point, Dmitry Gutov, 2016/06/22
- [elpa] master 3726fe2 093/173: [ci skip] Use the "generic" language, Dmitry Gutov, 2016/06/22
- [elpa] master 946c798 095/173: Handle empty list of candidates, Dmitry Gutov, 2016/06/22
- [elpa] master c656b25 079/173: Merge pull request #418 from PythonNut/master,
Dmitry Gutov <=
- [elpa] master 931e758 101/173: Fix the workaround, Dmitry Gutov, 2016/06/22
- [elpa] master 049b0e6 048/173: company--begin-new: Check the value of c, Dmitry Gutov, 2016/06/22
- [elpa] master 250ca1c 088/173: Add company-etags-everywhere, Dmitry Gutov, 2016/06/22
- [elpa] master 21da29b 082/173: Update copyright, Dmitry Gutov, 2016/06/22
- [elpa] master cec8779 075/173: Introduce company-search-regexp-function, Dmitry Gutov, 2016/06/22
- [elpa] master 6165cb2 083/173: Don't "adjust key" (#422), Dmitry Gutov, 2016/06/22
- [elpa] master e5177c9 105/173: Add company-tooltip-annotation-selection face, Dmitry Gutov, 2016/06/22
- [elpa] master 75e21f6 045/173: company-css: Support web-mode, Dmitry Gutov, 2016/06/22
- [elpa] master e6ea779 004/173: Add `company-diag', Dmitry Gutov, 2016/06/22
- [elpa] master 0b37d17 044/173: company-mode: Mention the sorting order, Dmitry Gutov, 2016/06/22