[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1028f38 20/23: company-indent-or-complete-common: Blacklis
From: |
Dmitry Gutov |
Subject: |
[elpa] master 1028f38 20/23: company-indent-or-complete-common: Blacklist some indentation functions |
Date: |
Fri, 11 Nov 2016 22:21:42 +0000 (UTC) |
branch: master
commit 1028f3812fc863f61fbe38ec7a6b2ed1993c1eec
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company-indent-or-complete-common: Blacklist some indentation functions
Fixes #605.
---
NEWS.md | 2 ++
company.el | 3 +++
2 files changed, 5 insertions(+)
diff --git a/NEWS.md b/NEWS.md
index ecb48f8..2cc8388 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,8 @@
## Next
+* `company-indent-or-complete-common` skips trying to indent if
+ `indent-line-function` is `indent-relative` or `indent-relative-maybe`.
* Better visualization of search matches. New face
`company-tooltip-search-selection`.
* New variable `company-files-exclusions`.
* `company-next-page` and `company-previous-page` adhere to
diff --git a/company.el b/company.el
index d46e96a..ce5a652 100644
--- a/company.el
+++ b/company.el
@@ -2104,6 +2104,9 @@ With ARG, move by that many elements."
(cond
((use-region-p)
(indent-region (region-beginning) (region-end)))
+ ((memq indent-line-function
+ '(indent-relative indent-relative-maybe))
+ (company-complete-common))
((let ((old-point (point))
(old-tick (buffer-chars-modified-tick))
(tab-always-indent t))
- [elpa] master fc39277 15/23: Add keywords for rust-mode to company-keywords., (continued)
- [elpa] master fc39277 15/23: Add keywords for rust-mode to company-keywords., Dmitry Gutov, 2016/11/11
- [elpa] master f78f9c1 21/23: Initialize grouped backends on the fly as well, Dmitry Gutov, 2016/11/11
- [elpa] master e6689ea 12/23: company-files--directory-files: Swallow file-error, Dmitry Gutov, 2016/11/11
- [elpa] master 9476aef 09/23: company-files--directory-files: Don't ignore errors, Dmitry Gutov, 2016/11/11
- [elpa] master c353c71 14/23: global goes through all the tag files listed in GTAGSLIBPATH, Dmitry Gutov, 2016/11/11
- [elpa] master f2327bc 19/23: Merge pull request #575 from Wilfred/patch-1, Dmitry Gutov, 2016/11/11
- [elpa] master e077caf 22/23: Release 0.9.1, Dmitry Gutov, 2016/11/11
- [elpa] master ba87881 16/23: Merge pull request #572 from Wilfred/rust_keywords, Dmitry Gutov, 2016/11/11
- [elpa] master 6025006 08/23: Add company-files-exclusions, Dmitry Gutov, 2016/11/11
- [elpa] master d8ca520 13/23: Improve search visualization, Dmitry Gutov, 2016/11/11
- [elpa] master 1028f38 20/23: company-indent-or-complete-common: Blacklist some indentation functions,
Dmitry Gutov <=
- [elpa] master 85bd83e 23/23: Merge commit 'e077caf1957f1846fae29aa84a021234c43be96f', Dmitry Gutov, 2016/11/11
- [elpa] master 917936c 17/23: Fix keyword ordering, Dmitry Gutov, 2016/11/11