emacs-elpa-diffs
[Top][All Lists]
Advanced

[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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]