[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/corfu 9e00e8ab49 2/2: corfu-popupinfo/corfu-info: Handl
From: |
ELPA Syncer |
Subject: |
[elpa] externals/corfu 9e00e8ab49 2/2: corfu-popupinfo/corfu-info: Handle nil location gracefully |
Date: |
Tue, 22 Nov 2022 11:57:41 -0500 (EST) |
branch: externals/corfu
commit 9e00e8ab49522da51f58c73c9df4c704ce69c230
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
corfu-popupinfo/corfu-info: Handle nil location gracefully
---
extensions/corfu-info.el | 9 +++++----
extensions/corfu-popupinfo.el | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/extensions/corfu-info.el b/extensions/corfu-info.el
index e62bf3642b..432e0fb5e8 100644
--- a/extensions/corfu-info.el
+++ b/extensions/corfu-info.el
@@ -82,10 +82,11 @@
(with-selected-window (display-buffer buf t)
(save-restriction
(widen)
- (if (bufferp (car loc))
- (goto-char (cdr loc))
- (goto-char (point-min))
- (forward-line (1- (cdr loc))))
+ (goto-char (point-min))
+ (when-let (pos (cdr loc))
+ (if (bufferp (car loc))
+ (goto-char pos)
+ (forward-line (1- pos))))
(set-window-start nil (point)))))
(user-error "No location available")))
diff --git a/extensions/corfu-popupinfo.el b/extensions/corfu-popupinfo.el
index 8e153cfeb9..11512373a1 100644
--- a/extensions/corfu-popupinfo.el
+++ b/extensions/corfu-popupinfo.el
@@ -182,10 +182,11 @@ all values are in pixels relative to the origin. See
(save-excursion
(save-restriction
(widen)
- (if (bufferp (car loc))
- (goto-char (cdr loc))
- (goto-char (point-min))
- (forward-line (1- (cdr loc))))
+ (goto-char (point-min))
+ (when-let (pos (cdr loc))
+ (if (bufferp (car loc))
+ (goto-char pos)
+ (forward-line (1- pos))))
(let ((beg (point)))
;; Support a little bit of scrolling.
(forward-line (* 10 corfu-popupinfo-max-height))