From 5dc163f592a779f759fc0b259dd4f4b50678655c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 28 Feb 2023 15:15:27 +0200 Subject: ; Add a doc string for 'ediff-window-display-p' obsolescence * lisp/vc/ediff-init.el (ediff-window-display-p): Document how to prevent Ediff from creating additional frames, now that this function can no longer be used or advised for that. (Bug#61850) --- lisp/vc/ediff-init.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lisp/vc') diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index d78f9ad9f36..28630792211 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -1527,7 +1527,10 @@ This default should work without changes." (define-obsolete-function-alias 'ediff-convert-standard-filename #'convert-standard-filename "28.1") (define-obsolete-function-alias 'ediff-hide-face #'ignore "28.1") (define-obsolete-function-alias 'ediff-file-remote-p #'file-remote-p "29.1") -(define-obsolete-function-alias 'ediff-window-display-p #'display-graphic-p "29.1") +(define-obsolete-function-alias 'ediff-window-display-p #'display-graphic-p "29.1" + "To prevent Ediff from creating frames, see `ediff-window-setup-function'. +Set it to `ediff-setup-windows-plain' to do everything in a single frame, +even on GUI terminal.") (define-obsolete-function-alias 'ediff-mouse-event-p #'mouse-event-p "29.1") (provide 'ediff-init) -- cgit v1.2.3