[elpa] master bcd3d33 8/8: Merge commit 'c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e' from company

[Dmitry Gutov]

branch: master
commit bcd3d330c5eec7821bc8423fb696e97be2ffc63c
Merge: 85bd83e c9912e9
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Merge commit 'c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e' from company
---
 packages/company/company.el          |    7 ++++---
 packages/company/test/files-tests.el |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/company/company.el b/packages/company/company.el
index 360142b..32b4b1a 100644
--- a/packages/company/company.el
+++ b/packages/company/company.el
@@ -5,7 +5,7 @@
 ;; Author: Nikolaj Schumacher
 ;; Maintainer: Dmitry Gutov <address@hidden>
 ;; URL: http://company-mode.github.io/
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Keywords: abbrev, convenience, matching
 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
 
@@ -1448,7 +1448,7 @@ prefix match (same case) will be prioritized."
                (eq company-require-match t))))))
 
 (defun company-auto-complete-p (input)
-  "Return non-nil, if input starts with punctuation or parentheses."
+  "Return non-nil if INPUT should trigger auto-completion."
   (and (if (functionp company-auto-complete)
            (funcall company-auto-complete)
          company-auto-complete)
@@ -1457,7 +1457,8 @@ prefix match (same case) will be prioritized."
          (if (consp company-auto-complete-chars)
              (memq (char-syntax (string-to-char input))
                    company-auto-complete-chars)
-           (string-match (substring input 0 1) company-auto-complete-chars)))))
+           (string-match (regexp-quote (substring input 0 1))
+                          company-auto-complete-chars)))))
 
 (defun company--incremental-p ()
   (and (> (point) company-point)
diff --git a/packages/company/test/files-tests.el 
b/packages/company/test/files-tests.el
index 254baa2..2e89d8d 100644
--- a/packages/company/test/files-tests.el
+++ b/packages/company/test/files-tests.el
@@ -30,7 +30,7 @@
 
 (ert-deftest company-files-candidates-normal-root ()
   (let (company-files--completion-cache)
-    (should (member "/lost+found/"
+    (should (member "/bin/"
                     (company-files 'candidates "/")))))
 
 (ert-deftest company-files-candidates-excluding-dir ()