Don't use `require-match t' in normal backends

Fixes #351

diff --git a/company-abbrev.el b/company-abbrev.el
index a454aaa90d277c2d3950b7a5177969152fa2090f..0a849ad5db5200e5f1eebd7b57b1aba34ec226af 100644 (file)
--- a/company-abbrev.el
+++ b/company-abbrev.el
@@ -1,6 +1,6 @@
 ;;; company-abbrev.el --- company-mode completion back-end for abbrev
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2015  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -44,8 +44,7 @@
     (candidates (nconc
                  (delete "" (all-completions arg global-abbrev-table))
                  (delete "" (all-completions arg local-abbrev-table))))
-    (meta (abbrev-expansion arg))
-    (require-match t)))
+    (meta (abbrev-expansion arg))))
 
 (provide 'company-abbrev)
 ;;; company-abbrev.el ends here

diff --git a/company-tempo.el b/company-tempo.el
index ac91988623d3d1a8ea4b926e8474d81212933b96..09d1dfbfd991712329bf387ad44a85d9cf1058c6 100644 (file)
--- a/company-tempo.el
+++ b/company-tempo.el
@@ -1,6 +1,6 @@
 ;;; company-tempo.el --- company-mode completion back-end for tempo
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011, 2015  Free Software Foundation, Inc.
 
 ;; Author: Nikolaj Schumacher
 
@@ -56,7 +56,6 @@
     (prefix (or (car (tempo-find-match-string tempo-match-finder)) ""))
     (candidates (all-completions arg (tempo-build-collection)))
     (meta (company-tempo-meta arg))
-    (require-match t)
     (sorted t)))
 
 (provide 'company-tempo)

diff --git a/company.el b/company.el
index ec42103401925ba5ffd207da0030dbd57f857d14..8bb7ea338efa888ffd0ece8c7b8c9fc69d3d9a82 100644 (file)
--- a/company.el
+++ b/company.el
@@ -389,9 +389,10 @@ will be used when rendering the popup.  This command only makes sense for
 backends that provide non-prefix completion.
 
 `require-match': If this returns t, the user is not allowed to enter
-anything not offered as a candidate.  Use with care!  The default value nil
-gives the user that choice with `company-require-match'.  Return value
-`never' overrides that option the other way around.
+anything not offered as a candidate.  Please don't use that value in normal
+backends.  The default value nil gives the user that choice with
+`company-require-match'.  Return value `never' overrides that option the
+other way around.
 
 `init': Called once for each buffer. The back-end can check for external
 programs and files and load any required libraries.  Raising an error here