procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Add a doc string for 'ediff-window-display-p' obsolescence

Browse source 
* 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)
This commit is contained in:
Eli Zaretskii 2023-02-28 15:15:27 +02:00
parent 613de66281
commit 5dc163f592
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/ediff-init.el
View file

@ -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)