From d91ffdbec2bae4b338fa9148fc66b74853cb3f69 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 8 Aug 2022 21:28:53 +0200 Subject: [PATCH] Don't mention XEmacs toolbar in ediff manual * doc/misc/ediff.texi (Other Session Commands): Don't mention XEmacs specific toolbar support for now. This can be changed back once the toolbar is ported to Emacs. --- doc/misc/ediff.texi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index d81ba158a19..8a7de88d655 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -947,12 +947,14 @@ This function can also be invoked from the Menubar. However, in some cases, the change will take place only after you execute one of the Ediff commands, such as going to the next difference or redisplaying. +@c --> The below can be revisited once the toolbar has been ported to Emacs: +@ignore @item ediff-toggle-use-toolbar @findex ediff-toggle-use-toolbar -Available in XEmacs only. The Ediff toolbar provides quick access to some -of the common Ediff functions. This function toggles the display of the -toolbar. If invoked from the menubar, the function may take sometimes -effect only after you execute an Ediff command, such as going to the next +The Ediff toolbar provides quick access to some of the common Ediff +functions. This function toggles the display of the toolbar. If +invoked from the menubar, the function may take sometimes effect only +after you execute an Ediff command, such as going to the next difference. @item ediff-use-toolbar-p @@ -961,6 +963,7 @@ The use of the toolbar can also be specified via the variable @code{ediff-use-toolbar-p} (default is @code{t}). This variable can be set only in @file{.emacs}: do @strong{not} change it interactively. Use the function @code{ediff-toggle-use-toolbar} instead. +@end ignore @item ediff-revert-buffers-then-recompute-diffs @findex ediff-revert-buffers-then-recompute-diffs -- 2.39.2