From ac6531adfffc5bc6729a9f481ce4bc60800c4d68 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 7 Jul 2011 18:38:27 +0200 Subject: [PATCH] Remove mention of `require' in ediff.texi That's not pertinent in the installed Emacs. Fixes: debbugs:9016 --- doc/misc/ChangeLog | 5 +++++ doc/misc/ediff.texi | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ff5831caa1..a977b9d2f7 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2011-07-07 Lars Magne Ingebrigtsen + + * ediff.texi (Major Entry Points): Remove mention of `require', + since that's not pertinent in the installed Emacs (bug#9016). + 2011-07-05 Lars Magne Ingebrigtsen * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks. diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 3ba0796e63..20c2ed9087 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -334,18 +334,6 @@ Brings up Ediff session registry. This feature enables you to quickly find and restart active Ediff sessions. @end table -@noindent -If you want Ediff to be loaded from the very beginning of your Emacs -session, you should put this line in your @file{~/.emacs} file: - -@example -(require 'ediff) -@end example - -@noindent -Otherwise, Ediff will be loaded automatically when you use one of the -above functions, either directly or through the menus. - When the above functions are invoked, the user is prompted for all the necessary information---typically the files or buffers to compare, merge, or patch. Ediff tries to be smart about these prompts. For instance, in -- 2.20.1