And another rename. Hopefully, this one will stick.

diff --git a/company-clang.el b/company-clang.el
index fc426d3b7d63096431aa4a45cc589b0749690565..3d28f0ccdb80145abc587deb086dfe5fb7ee46d0 100644 (file)
--- a/company-clang.el
+++ b/company-clang.el
@@ -245,7 +245,7 @@ Completions only work correctly when the buffer has been saved.
                "#]" " "
                (replace-regexp-in-string "[<{[]#\\|#[>}]" "" meta t)
                t))))
-    (safe (and (derived-mode-p 'objc-mode)
+    (crop (and (derived-mode-p 'objc-mode)
                (string-match ":" arg)
                (substring arg 0 (match-beginning 0))))
     (post-completion (and (derived-mode-p 'objc-mode)

diff --git a/company-eclim.el b/company-eclim.el
index fd74a013acdc9ea6243f3efb37112bc56b22ae91..6d893694c9d2d5b73de2e3429d87fd79b8c4db2a 100644 (file)
--- a/company-eclim.el
+++ b/company-eclim.el
@@ -167,7 +167,7 @@ Completions only work correctly when the buffer has been saved.
     (meta (company-eclim--meta arg))
     ;; because "" doesn't return everything
     (no-cache (equal arg ""))
-    (safe (when (string-match "(" arg)
+    (crop (when (string-match "(" arg)
             (substring arg 0 (match-beginning 0))))
     (post-completion (when (string-match "([^)]" arg)
                        (company-eclim--templatify arg)))))

diff --git a/company.el b/company.el
index ff4f29f686d43667da5be60a57ba59b024996df6..b434747610841e86889e952c40fe11246aecf85b 100644 (file)
--- a/company.el
+++ b/company.el
@@ -797,7 +797,7 @@ can retrieve meta-data for them."
     (setq company-candidates nil)))
 
 (defun company--safe-candidate (str)
-  (or (company-call-backend 'safe str)
+  (or (company-call-backend 'crop str)
       str))
 
 (defun company-calculate-candidates (prefix)