summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@tradeo.com>2014-08-05 14:29:57 +0300
committerBozhidar Batsov <bozhidar@tradeo.com>2014-08-05 14:29:57 +0300
commit544dab00c9098ca357e2cccdcf4b26f4ec6f6c6b (patch)
tree463b52756791c555f08cb0e77822bb8362760990
parent80331d4bd55d467ffca250dd10b5f56e7131edc2 (diff)
Update company-mode section
-rw-r--r--README.md12
1 files changed, 5 insertions, 7 deletions
diff --git a/README.md b/README.md
index 07ffdc71..56f22b39 100644
--- a/README.md
+++ b/README.md
@@ -429,13 +429,11 @@ enable `paredit` in the REPL buffer as well:
(add-hook 'cider-repl-mode-hook 'rainbow-delimiters-mode)
```
-* [company-mode](http://company-mode.github.io/) provides in-buffer
- completion framework. When its `company-capf` back-end is enabled, it will
- retrieve completion information from `cider-complete-at-point`,
- requiring no additional setup. On Emacs 24.4 and newer
- `company-capf` is enabled out of the box. `CIDER` users are advised
- to use `company-mode` instead of `auto-complete-mode` for optimal
- results.
+* [company-mode](http://company-mode.github.io/) provides in-buffer completion
+ framework. When `company-mode` is enabled, it will retrieve completion
+ information from `cider-complete-at-point`, requiring no additional setup (and
+ no `company-mode` plugins). `CIDER` users are advised to use `company-mode`
+ instead of `auto-complete-mode` for optimal results.
* [ac-cider](https://github.com/clojure-emacs/ac-cider) provides
completion source for the popular Emacs interactive auto-completion