[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 3962876e2b 1/2: Use display-graphic-p instead o
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/git-commit 3962876e2b 1/2: Use display-graphic-p instead of obsolete ediff-window-display-p |
|
Date: |
Sun, 18 Sep 2022 16:58:38 -0400 (EDT) |
branch: elpa/git-commit
commit 3962876e2bc880c221889a2f2317f003b314eb9f
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Use display-graphic-p instead of obsolete ediff-window-display-p
Obsolete since Emacs 29 / 6b4f6dfb4e195c572c6e8502a349afff5f7987b9.
---
lisp/magit-ediff.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index 7b6dd0cec1..eba5c477e3 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -587,7 +587,7 @@ stash that were staged."
(ediff-kill-buffer-carefully ediff-debug-buffer)
(when (boundp 'ediff-patch-diagnostics)
(ediff-kill-buffer-carefully ediff-patch-diagnostics))
- (cond ((and (ediff-window-display-p)
+ (cond ((and (display-graphic-p)
(frame-live-p ctl-frm))
(delete-frame ctl-frm))
((window-live-p ctl-win)