[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/company d923b58357 3/7: Fix CI failure
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/company d923b58357 3/7: Fix CI failure |
|
Date: |
Thu, 9 Nov 2023 21:57:31 -0500 (EST) |
branch: externals/company
commit d923b583571835e16061148f2efba7f767255a99
Author: Dmitry Gutov <dmitry@gutov.dev>
Commit: Dmitry Gutov <dmitry@gutov.dev>
Fix CI failure
#1394
---
company.el | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/company.el b/company.el
index a38fe769c8..880dbe608d 100644
--- a/company.el
+++ b/company.el
@@ -1058,12 +1058,15 @@ means that `company-mode' is always turned on except in
`message-mode' buffers."
(declare-function line-number-display-width "indent.c")
(defun company--posn-col-row (posn)
- (let ((col (car (posn-col-row posn t)))
- ;; `posn-col-row' doesn't work well with lines of different height.
- ;; `posn-actual-col-row' doesn't handle multiple-width characters.
- (row (cdr (or (posn-actual-col-row posn)
- ;; When position is non-visible for some reason.
- (posn-col-row posn t)))))
+ (let* ((col-row (if (>= emacs-major-version 29)
+ (posn-col-row posn t)
+ (posn-col-row posn)))
+ (col (car col-row))
+ ;; `posn-col-row' doesn't work well with lines of different height.
+ ;; `posn-actual-col-row' doesn't handle multiple-width characters.
+ (row (cdr (or (posn-actual-col-row posn)
+ ;; When position is non-visible for some reason.
+ col-row))))
;; posn-col-row return value relative to the left
(when (eq (current-bidi-paragraph-direction) 'right-to-left)
;; `remap' as 3rd argument to window-body-width is E30+ only :-(
- [elpa] externals/company updated (cba2bb8929 -> 07d1c41f83), ELPA Syncer, 2023/11/09
- [elpa] externals/company 81f43040d1 4/7: Fix CI try #2, ELPA Syncer, 2023/11/09
- [elpa] externals/company 07d1c41f83 7/7: Merge pull request #1425 from company-mode/fractional-scrollbar, ELPA Syncer, 2023/11/09
- [elpa] externals/company d923b58357 3/7: Fix CI failure,
ELPA Syncer <=
- [elpa] externals/company 125179d0a1 2/7: Fix: add cmake-ts-mode to company-cmake-modes, ELPA Syncer, 2023/11/09
- [elpa] externals/company 17367ee86f 5/7: Update NEWS, ELPA Syncer, 2023/11/09
- [elpa] externals/company 1fdba51490 1/7: Make scrollbar narrower; move into the right margin, ELPA Syncer, 2023/11/09
- [elpa] externals/company bd79ad6678 6/7: Merge pull request #1426 from nverno/fix/add-cmake-ts-mode, ELPA Syncer, 2023/11/09