diff options
Diffstat (limited to 'doc/misc/ediff.texi')
| -rw-r--r-- | doc/misc/ediff.texi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 20c2ed90873..01349e31468 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | This file documents Ediff, a comprehensive visual interface to Unix diff | 25 | This file documents Ediff, a comprehensive visual interface to Unix diff |
| 26 | and patch utilities. | 26 | and patch utilities. |
| 27 | 27 | ||
| 28 | Copyright @copyright{} 1995-2011 Free Software Foundation, Inc. | 28 | Copyright @copyright{} 1995-2012 Free Software Foundation, Inc. |
| 29 | 29 | ||
| 30 | @quotation | 30 | @quotation |
| 31 | Permission is granted to copy, distribute and/or modify this document | 31 | Permission is granted to copy, distribute and/or modify this document |
| @@ -433,6 +433,8 @@ command (see @kbd{ga}, @kbd{gb}, and @kbd{gc}). | |||
| 433 | 433 | ||
| 434 | @node Quick Help Commands,Other Session Commands,,Session Commands | 434 | @node Quick Help Commands,Other Session Commands,,Session Commands |
| 435 | @section Quick Help Commands | 435 | @section Quick Help Commands |
| 436 | @cindex command help | ||
| 437 | @cindex important commands | ||
| 436 | 438 | ||
| 437 | @table @kbd | 439 | @table @kbd |
| 438 | @item ? | 440 | @item ? |
| @@ -1207,7 +1209,7 @@ This hook can be used to alter bindings in Ediff's keymap, | |||
| 1207 | @code{ediff-mode-map}. These hooks are | 1209 | @code{ediff-mode-map}. These hooks are |
| 1208 | run right after the default bindings are set but before | 1210 | run right after the default bindings are set but before |
| 1209 | @code{ediff-load-hook}. The regular user needs not be concerned with this | 1211 | @code{ediff-load-hook}. The regular user needs not be concerned with this |
| 1210 | hook---it is provided for implementors of other Emacs packages built on top | 1212 | hook---it is provided for implementers of other Emacs packages built on top |
| 1211 | of Ediff. | 1213 | of Ediff. |
| 1212 | 1214 | ||
| 1213 | @item ediff-before-setup-windows-hook | 1215 | @item ediff-before-setup-windows-hook |
| @@ -1731,7 +1733,7 @@ faces, you can modify them when Ediff is being loaded using | |||
| 1731 | @end smallexample | 1733 | @end smallexample |
| 1732 | 1734 | ||
| 1733 | @strong{Please note:} to set Ediff's faces, use only @code{copy-face} | 1735 | @strong{Please note:} to set Ediff's faces, use only @code{copy-face} |
| 1734 | or @code{set/make-face-@dots{}} as shown above. Emacs' low-level | 1736 | or @code{set/make-face-@dots{}} as shown above. Emacs's low-level |
| 1735 | face-manipulation functions should be avoided. | 1737 | face-manipulation functions should be avoided. |
| 1736 | 1738 | ||
| 1737 | @node Narrowing, Refinement of Difference Regions, Highlighting Difference Regions, Customization | 1739 | @node Narrowing, Refinement of Difference Regions, Highlighting Difference Regions, Customization |