diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-08-17 06:30:25 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-08-17 06:30:25 +0200 |
| commit | 8f784a27667fbebdf320388ef2ec46ae67f69230 (patch) | |
| tree | 1f861a6518bab366a94c736bbaa6ed4f54d97a61 /lisp/vc/ediff.el | |
| parent | ed9adafc0bdcfc2c79534282f888df3b250db329 (diff) | |
| parent | a4078fa62847f34d65c8facbdf705c567f08b36b (diff) | |
| download | emacs-8f784a27667fbebdf320388ef2ec46ae67f69230.tar.gz emacs-8f784a27667fbebdf320388ef2ec46ae67f69230.tar.bz2 emacs-8f784a27667fbebdf320388ef2ec46ae67f69230.zip | |
Merge from origin/emacs-28
a4078fa628 ; * lisp/vc/ediff.el: Improve wording in last change.
dd077ebded Revert "; * doc/lispintro/emacs-lisp-intro.texi: Fix typo."
362c9ab879 * doc/misc/gnus.texi (Article Washing): Fix Links URL.
Diffstat (limited to 'lisp/vc/ediff.el')
| -rw-r--r-- | lisp/vc/ediff.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 94e3fc6d7fe..40473a2c03f 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -89,11 +89,11 @@ ;; underlining. However, if the region is already underlined by some other ;; overlays, there is no simple way to temporarily remove that residual ;; underlining. This problem occurs when a buffer is highlighted with -;; font-lock.el packages. If this residual highlighting gets in the way, you -;; can do the following. font-lock.el provides commands for unhighlighting -;; buffers. You can either place these commands in `ediff-prepare-buffer-hook' -;; (which will unhighlight every buffer used by Ediff) or you can execute -;; them interactively, at any time and in any buffer. +;; font-lock.el. If this residual highlighting gets in the way, you +;; can use the font-lock.el commands for unhighlighting buffers. +;; Either place these commands in `ediff-prepare-buffer-hook' (which will +;; unhighlight every buffer used by Ediff) or execute them +;; interactively, which you can do at any time and in any buffer. ;;; Acknowledgments: |