diff options
Diffstat (limited to 'doc/misc/ediff.texi')
| -rw-r--r-- | doc/misc/ediff.texi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 4259fccb390..c2897e185bf 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi | |||
| @@ -759,7 +759,7 @@ Displays a list of currently active Ediff sessions---the Ediff Registry. | |||
| 759 | You can then restart any of these sessions by either clicking on a session | 759 | You can then restart any of these sessions by either clicking on a session |
| 760 | record or by putting the cursor over it and then typing the return key. | 760 | record or by putting the cursor over it and then typing the return key. |
| 761 | 761 | ||
| 762 | (Some poor souls leave so many active Ediff sessions around that they loose | 762 | (Some poor souls leave so many active Ediff sessions around that they lose |
| 763 | track of them completely... The `R' command is designed to save these | 763 | track of them completely... The `R' command is designed to save these |
| 764 | people from the recently discovered Ediff Proficiency Syndrome.) | 764 | people from the recently discovered Ediff Proficiency Syndrome.) |
| 765 | 765 | ||
| @@ -2315,7 +2315,7 @@ other behavior. | |||
| 2315 | 2315 | ||
| 2316 | However, Ediff temporarily resets this variable to @code{t} if it is | 2316 | However, Ediff temporarily resets this variable to @code{t} if it is |
| 2317 | invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. | 2317 | invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. |
| 2318 | This is because it is all too easy to loose day's work otherwise. | 2318 | This is because it is all too easy to lose a day's work otherwise. |
| 2319 | Besides, in a "buffer" job, the variant buffers have already been loaded | 2319 | Besides, in a "buffer" job, the variant buffers have already been loaded |
| 2320 | prior to starting Ediff, so Ediff just preserves status quo here. | 2320 | prior to starting Ediff, so Ediff just preserves status quo here. |
| 2321 | 2321 | ||
| @@ -2542,6 +2542,3 @@ Eli Zaretskii (eliz at is.elta.co.il) | |||
| 2542 | 2542 | ||
| 2543 | @bye | 2543 | @bye |
| 2544 | 2544 | ||
| 2545 | @ignore | ||
| 2546 | arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46 | ||
| 2547 | @end ignore | ||