[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1de463a 29/78: company--window-width: Account for display-
From: |
Dmitry Gutov |
Subject: |
[elpa] master 1de463a 29/78: company--window-width: Account for display-line-numbers |
Date: |
Sun, 18 Feb 2018 07:40:18 -0500 (EST) |
branch: master
commit 1de463a564f90458e1b563a0532b607d93926f53
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company--window-width: Account for display-line-numbers
Fixes #724
---
company.el | 2 ++
1 file changed, 2 insertions(+)
diff --git a/company.el b/company.el
index ad35411..4fafcc2 100644
--- a/company.el
+++ b/company.el
@@ -2601,6 +2601,8 @@ If SHOW-VERSION is non-nil, show the version in the echo
area."
;; Account for the line continuation column.
(when (zerop (cadr (window-fringes)))
(cl-decf ww))
+ (when (bound-and-true-p display-line-numbers)
+ (cl-decf ww (+ 2 (line-number-display-width))))
(unless (or (display-graphic-p)
(version< "24.3.1" emacs-version))
;; Emacs 24.3 and earlier included margins
- [elpa] master 4c1fd0e 16/78: Merge pull request #706 from nikital/company-tng, (continued)
- [elpa] master 4c1fd0e 16/78: Merge pull request #706 from nikital/company-tng, Dmitry Gutov, 2018/02/18
- [elpa] master 096991d 26/78: Merge pull request #716 from jeffersoncarpenter/master, Dmitry Gutov, 2018/02/18
- [elpa] master 3d9272d 23/78: company-tng: Fully replace default frontend list, Dmitry Gutov, 2018/02/18
- [elpa] master 99fa5a0 30/78: Refine col-row calculation in the presence of line numbering, Dmitry Gutov, 2018/02/18
- [elpa] master 8dea612 39/78: Merge pull request #740 from Havner/master, Dmitry Gutov, 2018/02/18
- [elpa] master a4e14ed 40/78: Add some Commentary, Dmitry Gutov, 2018/02/18
- [elpa] master a574418 46/78: Fix last change, Dmitry Gutov, 2018/02/18
- [elpa] master 4a34571 25/78: Place cursor at correct location for completions, Dmitry Gutov, 2018/02/18
- [elpa] master 78cbc69 32/78: Test in Emacs 25, too, Dmitry Gutov, 2018/02/18
- [elpa] master cf89f7c 27/78: Abort dabbrev search on input pending, Dmitry Gutov, 2018/02/18
- [elpa] master 1de463a 29/78: company--window-width: Account for display-line-numbers,
Dmitry Gutov <=
- [elpa] master 47f3b9b 34/78: Which version?, Dmitry Gutov, 2018/02/18
- [elpa] master 098a907 35/78: Nah, Dmitry Gutov, 2018/02/18
- [elpa] master 27316ec 33/78: Try 'emacs', Dmitry Gutov, 2018/02/18
- [elpa] master 4884a5e 44/78: Fall back to earlier behavior with Clang < 4.0, Dmitry Gutov, 2018/02/18
- [elpa] master 157e8af 55/78: company-etags: Don't set tags-file-name globally, Dmitry Gutov, 2018/02/18
- [elpa] master 3b14294 56/78: Remove dup, Dmitry Gutov, 2018/02/18
- [elpa] master fd9a0fb 53/78: defcustom: prefer t instead of (meaningless) descriptive symbols, Dmitry Gutov, 2018/02/18
- [elpa] master 63ab036 62/78: Clean the annotation string before stripping it, Dmitry Gutov, 2018/02/18
- [elpa] master a870b69 24/78: Merge pull request #712 from nikital/tng-defaults, Dmitry Gutov, 2018/02/18
- [elpa] master 24e2aa7 36/78: Change to container-based Travis-CI build, Dmitry Gutov, 2018/02/18