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

Remove mention of `require' in ediff.texi

Browse source 
That's not pertinent in the installed Emacs.

Fixes: debbugs:9016
This commit is contained in:
Lars Magne Ingebrigtsen 2011-07-07 18:38:27 +02:00
parent 412f24b9dd
commit ac6531adff
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/misc/ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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 <larsi@gnus.org>
* gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.

12
doc/misc/ediff.texi
View file

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