aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-07 18:38:27 +0200
committerLars Magne Ingebrigtsen2011-07-07 18:38:27 +0200
commitac6531adfffc5bc6729a9f481ce4bc60800c4d68 (patch)
treee5b876a08fca590edf1858be26877663ce462375
parent412f24b9ddf1e07022f8c5fe05f0717f130c4c02 (diff)
downloademacs-ac6531adfffc5bc6729a9f481ce4bc60800c4d68.tar.gz
emacs-ac6531adfffc5bc6729a9f481ce4bc60800c4d68.zip
Remove mention of `require' in ediff.texi
That's not pertinent in the installed Emacs. Fixes: debbugs:9016
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/ediff.texi12
2 files changed, 5 insertions, 12 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ff5831caa12..a977b9d2f7f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * ediff.texi (Major Entry Points): Remove mention of `require',
4 since that's not pertinent in the installed Emacs (bug#9016).
5
12011-07-05 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-07-05 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks. 8 * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 3ba0796e636..20c2ed90873 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
334and restart active Ediff sessions. 334and restart active Ediff sessions.
335@end table 335@end table
336 336
337@noindent
338If you want Ediff to be loaded from the very beginning of your Emacs
339session, you should put this line in your @file{~/.emacs} file:
340
341@example
342(require 'ediff)
343@end example
344
345@noindent
346Otherwise, Ediff will be loaded automatically when you use one of the
347above functions, either directly or through the menus.
348
349When the above functions are invoked, the user is prompted for all the 337When the above functions are invoked, the user is prompted for all the
350necessary information---typically the files or buffers to compare, merge, or 338necessary information---typically the files or buffers to compare, merge, or
351patch. Ediff tries to be smart about these prompts. For instance, in 339patch. Ediff tries to be smart about these prompts. For instance, in