[elpa] master d789f26 54/78: Merge pull request #754 from jabranham/fix-defcustom

[Dmitry Gutov]

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."