diff options
| author | Lars Magne Ingebrigtsen | 2011-07-07 18:38:27 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-07 18:38:27 +0200 |
| commit | ac6531adfffc5bc6729a9f481ce4bc60800c4d68 (patch) | |
| tree | e5b876a08fca590edf1858be26877663ce462375 | |
| parent | 412f24b9ddf1e07022f8c5fe05f0717f130c4c02 (diff) | |
| download | emacs-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/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/ediff.texi | 12 |
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 @@ | |||
| 1 | 2011-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 | |||
| 1 | 2011-07-05 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2011-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 | |||
| 334 | and restart active Ediff sessions. | 334 | and restart active Ediff sessions. |
| 335 | @end table | 335 | @end table |
| 336 | 336 | ||
| 337 | @noindent | ||
| 338 | If you want Ediff to be loaded from the very beginning of your Emacs | ||
| 339 | session, you should put this line in your @file{~/.emacs} file: | ||
| 340 | |||
| 341 | @example | ||
| 342 | (require 'ediff) | ||
| 343 | @end example | ||
| 344 | |||
| 345 | @noindent | ||
| 346 | Otherwise, Ediff will be loaded automatically when you use one of the | ||
| 347 | above functions, either directly or through the menus. | ||
| 348 | |||
| 349 | When the above functions are invoked, the user is prompted for all the | 337 | When the above functions are invoked, the user is prompted for all the |
| 350 | necessary information---typically the files or buffers to compare, merge, or | 338 | necessary information---typically the files or buffers to compare, merge, or |
| 351 | patch. Ediff tries to be smart about these prompts. For instance, in | 339 | patch. Ediff tries to be smart about these prompts. For instance, in |