diff options
| author | Stefan Kangas | 2022-08-08 21:28:53 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-08-08 21:28:53 +0200 |
| commit | d91ffdbec2bae4b338fa9148fc66b74853cb3f69 (patch) | |
| tree | f8a2fefa2918ad141c439436bc9a89291cc8d783 | |
| parent | 7ffcba4213786569954bbdd9b7d7aa741b5014c9 (diff) | |
| download | emacs-d91ffdbec2bae4b338fa9148fc66b74853cb3f69.tar.gz emacs-d91ffdbec2bae4b338fa9148fc66b74853cb3f69.zip | |
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.
| -rw-r--r-- | doc/misc/ediff.texi | 11 |
1 files 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 | |||
| 947 | cases, the change will take place only after you execute one of the Ediff | 947 | cases, the change will take place only after you execute one of the Ediff |
| 948 | commands, such as going to the next difference or redisplaying. | 948 | commands, such as going to the next difference or redisplaying. |
| 949 | 949 | ||
| 950 | @c --> The below can be revisited once the toolbar has been ported to Emacs: | ||
| 951 | @ignore | ||
| 950 | @item ediff-toggle-use-toolbar | 952 | @item ediff-toggle-use-toolbar |
| 951 | @findex ediff-toggle-use-toolbar | 953 | @findex ediff-toggle-use-toolbar |
| 952 | Available in XEmacs only. The Ediff toolbar provides quick access to some | 954 | The Ediff toolbar provides quick access to some of the common Ediff |
| 953 | of the common Ediff functions. This function toggles the display of the | 955 | functions. This function toggles the display of the toolbar. If |
| 954 | toolbar. If invoked from the menubar, the function may take sometimes | 956 | invoked from the menubar, the function may take sometimes effect only |
| 955 | effect only after you execute an Ediff command, such as going to the next | 957 | after you execute an Ediff command, such as going to the next |
| 956 | difference. | 958 | difference. |
| 957 | 959 | ||
| 958 | @item ediff-use-toolbar-p | 960 | @item ediff-use-toolbar-p |
| @@ -961,6 +963,7 @@ The use of the toolbar can also be specified via the variable | |||
| 961 | @code{ediff-use-toolbar-p} (default is @code{t}). This variable can be set | 963 | @code{ediff-use-toolbar-p} (default is @code{t}). This variable can be set |
| 962 | only in @file{.emacs}: do @strong{not} change it interactively. Use the | 964 | only in @file{.emacs}: do @strong{not} change it interactively. Use the |
| 963 | function @code{ediff-toggle-use-toolbar} instead. | 965 | function @code{ediff-toggle-use-toolbar} instead. |
| 966 | @end ignore | ||
| 964 | 967 | ||
| 965 | @item ediff-revert-buffers-then-recompute-diffs | 968 | @item ediff-revert-buffers-then-recompute-diffs |
| 966 | @findex ediff-revert-buffers-then-recompute-diffs | 969 | @findex ediff-revert-buffers-then-recompute-diffs |