[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d789f26 54/78: Merge pull request #754 from jabranham/fix-
From: |
Dmitry Gutov |
Subject: |
[elpa] master d789f26 54/78: Merge pull request #754 from jabranham/fix-defcustom |
Date: |
Sun, 18 Feb 2018 07:40:25 -0500 (EST) |
branch: master
commit d789f2643c11f7c53fc47ed9d9b271bb6f6718a3
Merge: 4a8289d fd9a0fb
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #754 from jabranham/fix-defcustom
Fix defcustom
---
company-dabbrev.el | 12 ++++++++++--
company-semantic.el | 3 ++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/company-dabbrev.el b/company-dabbrev.el
index ecb7feb..5d2f318 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -59,7 +59,11 @@ Or a function that returns non-nil for such buffers."
(defcustom company-dabbrev-ignore-case 'keep-prefix
"Non-nil to ignore case when collecting completion candidates.
When it's `keep-prefix', the text before point will remain unchanged after
-candidate is inserted, even some of its characters have different case.")
+candidate is inserted, even some of its characters have different case."
+ :type '(choice
+ (const :tag "Don't ignore case" nil)
+ (const :tag "Ignore case" t)
+ (const :tag "Keep case before point" keep-prefix)))
(defcustom company-dabbrev-downcase 'case-replace
"Whether to downcase the returned candidates.
@@ -69,7 +73,11 @@ The value of nil means keep them as-is.
Any other value means downcase.
If you set this value to nil, you may also want to set
-`company-dabbrev-ignore-case' to any value other than `keep-prefix'.")
+`company-dabbrev-ignore-case' to any value other than `keep-prefix'."
+ :type '(choice
+ (const :tag "Keep as-is" nil)
+ (const :tag "Downcase" t)
+ (const :tag "Use case-replace" case-replace)))
(defcustom company-dabbrev-minimum-length 4
"The minimum length for the completion candidate to be included.
diff --git a/company-semantic.el b/company-semantic.el
index ff9f66a..2f6fe2a 100644
--- a/company-semantic.el
+++ b/company-semantic.el
@@ -56,7 +56,8 @@ symbol is preceded by \".\", \"->\" or \"::\", ignoring
If `company-begin-commands' is a list, it should include `c-electric-lt-gt'
and `c-electric-colon', for automatic completion right after \">\" and
-\":\".")
+\":\"."
+ :type 'boolean)
(defcustom company-semantic-insert-arguments t
"When non-nil, insert function arguments as a template after completion."
- [elpa] master bf94032 68/78: More NEWS entries, (continued)
- [elpa] master bf94032 68/78: More NEWS entries, Dmitry Gutov, 2018/02/18
- [elpa] master 0284f41 67/78: Merge branch 'simpler-async', Dmitry Gutov, 2018/02/18
- [elpa] master aaae46b 74/78: M-x copyright-update, Dmitry Gutov, 2018/02/18
- [elpa] master 66e43a3 31/78: Add interactive tags and skip-unless, Dmitry Gutov, 2018/02/18
- [elpa] master cb2ae50 38/78: Don't restart semantics after ::, Dmitry Gutov, 2018/02/18
- [elpa] master 75b4daa 37/78: Merge pull request #737 from iquiw/container-based-ci, Dmitry Gutov, 2018/02/18
- [elpa] master 0f70fee 47/78: Add keywords for swift-mode, Dmitry Gutov, 2018/02/18
- [elpa] master 10807eb 48/78: Merge pull request #750 from jojojames/master, Dmitry Gutov, 2018/02/18
- [elpa] master 556fe45 45/78: Specify type, Dmitry Gutov, 2018/02/18
- [elpa] master e97d26f 51/78: Specify :type for company-dabbrev -ignore-case and -downcase, Dmitry Gutov, 2018/02/18
- [elpa] master d789f26 54/78: Merge pull request #754 from jabranham/fix-defcustom,
Dmitry Gutov <=
- [elpa] master 3959af9 52/78: Specify :type for company-semantic-begin-after-member-access, Dmitry Gutov, 2018/02/18
- [elpa] master 7c5408c 57/78: company-clang--start-process: Kill the existing process, if any, Dmitry Gutov, 2018/02/18
- [elpa] master 0efc9f3 58/78: Reindent, Dmitry Gutov, 2018/02/18
- [elpa] master b22df34 60/78: Use inhibit-redisplay, Dmitry Gutov, 2018/02/18
- [elpa] master 307b620 59/78: Simplify how async backends are called (WIP), Dmitry Gutov, 2018/02/18
- [elpa] master 82d41b7 70/78: Avoid an extra redisplay call, Dmitry Gutov, 2018/02/18
- [elpa] master 4004c7f 42/78: Merge pull request #748 from nikital/tng-dont-require-match, Dmitry Gutov, 2018/02/18
- [elpa] master 6ddeae2 43/78: Rework Clang version handling, Dmitry Gutov, 2018/02/18
- [elpa] master 0bd111d 49/78: Add keywords for kotlin-mode, Dmitry Gutov, 2018/02/18
- [elpa] master f3910a2 71/78: Add a comment justifying the duplication [ci skip], Dmitry Gutov, 2018/02/18