diff options
Diffstat (limited to 'lisp/vc/ediff.el')
| -rw-r--r-- | lisp/vc/ediff.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 84ad5cef90f..94e3fc6d7fe 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -89,12 +89,11 @@ | |||
| 89 | ;; underlining. However, if the region is already underlined by some other | 89 | ;; underlining. However, if the region is already underlined by some other |
| 90 | ;; overlays, there is no simple way to temporarily remove that residual | 90 | ;; overlays, there is no simple way to temporarily remove that residual |
| 91 | ;; underlining. This problem occurs when a buffer is highlighted with | 91 | ;; underlining. This problem occurs when a buffer is highlighted with |
| 92 | ;; hilit19.el or font-lock.el packages. If this residual highlighting gets | 92 | ;; font-lock.el packages. If this residual highlighting gets in the way, you |
| 93 | ;; in the way, you can do the following. Both font-lock.el and hilit19.el | 93 | ;; can do the following. font-lock.el provides commands for unhighlighting |
| 94 | ;; provide commands for unhighlighting buffers. You can either place these | 94 | ;; buffers. You can either place these commands in `ediff-prepare-buffer-hook' |
| 95 | ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every | 95 | ;; (which will unhighlight every buffer used by Ediff) or you can execute |
| 96 | ;; buffer used by Ediff) or you can execute them interactively, at any time | 96 | ;; them interactively, at any time and in any buffer. |
| 97 | ;; and on any buffer. | ||
| 98 | 97 | ||
| 99 | 98 | ||
| 100 | ;;; Acknowledgments: | 99 | ;;; Acknowledgments: |