diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/vc/compare-w.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/vc/compare-w.el')
| -rw-r--r-- | lisp/vc/compare-w.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el index cec16446984..d6e3240eaf7 100644 --- a/lisp/vc/compare-w.el +++ b/lisp/vc/compare-w.el @@ -132,13 +132,13 @@ out all highlighting later with the command `compare-windows-dehighlight'." (defface compare-windows-removed '((t :inherit diff-removed)) - "Face for highlighting of compare-windows removed regions." + "Face for highlighting `compare-windows' differing regions in the other window." :group 'compare-windows :version "25.1") (defface compare-windows-added '((t :inherit diff-added)) - "Face for highlighting of compare-windows added regions." + "Face for highlighting `compare-windows' differing regions in current window." :group 'compare-windows :version "25.1") |