[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 d91ffdbec2: Don't mention XEmacs toolbar in ediff manual
From: |
Stefan Kangas |
Subject: |
emacs-28 d91ffdbec2: Don't mention XEmacs toolbar in ediff manual |
Date: |
Mon, 8 Aug 2022 15:29:02 -0400 (EDT) |
branch: emacs-28
commit d91ffdbec2bae4b338fa9148fc66b74853cb3f69
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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 d81ba158a1..8a7de88d65 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 d91ffdbec2: Don't mention XEmacs toolbar in ediff manual,
Stefan Kangas <=