1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-15 15:50:57 -08:00
emacs/lisp/vc
Juri Linkov bc1b21bb4e Use the same diff color scheme as in modern VCSes (bug#10181).
* lisp/vc/diff-mode.el (diff-header, diff-file-header): Remove "green"
to avoid confusion with `diff-added' that now uses green colors.
(diff-removed): Use shades of red.
(diff-added): Use shades of green.
(diff-changed): Leave just the yellow color.
(diff-use-changed-face): New variable.
(diff-font-lock-keywords): Use `diff-use-changed-face' to decide
how to highlight context diff changes.
(diff-refine-change): Use shades of yellow.
(diff-refine-removed): New face that uses shades of red.
(diff-refine-added): New face that uses shades of green.
(diff-refine-hunk): Use `diff-refine-change', `diff-refine-added',
`diff-refine-removed' in the call to `smerge-refine-subst'
depending on the value of `diff-use-changed-face'.

* lisp/vc/ediff-init.el (ediff-current-diff-A, ediff-fine-diff-A):
Add face condition `min-colors 88' with shades of red.
(ediff-current-diff-B, ediff-fine-diff-B): Add face condition
`min-colors 88' with shades of green.
(ediff-current-diff-C, ediff-fine-diff-C): Add face condition
`min-colors 88' with shades of yellow.

* lisp/vc/smerge-mode.el (smerge-mine): Use shades of red.
(smerge-other): Use shades of green.
(smerge-base): Use shades of yellow.
(smerge-refined-change): Empty face.
(smerge-refined-removed): New face that uses shades of red.
(smerge-refined-added): New face that uses shades of green.
(smerge-refine-subst): Rename arg `props' to `props-c'.  Add new
args `props-r' and `props-a', and use them.  Doc fix.
(smerge-refine): Evaluate `smerge-use-changed-face' and depending
on its value use different faces `smerge-refined-change',
`smerge-refined-removed', `smerge-refined-added' in the call to
`smerge-refine-subst'.
2012-05-25 03:55:40 +03:00
..
add-log.el Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
compare-w.el
cvs-status.el Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
diff-mode.el Use the same diff color scheme as in modern VCSes (bug#10181). 2012-05-25 03:55:40 +03:00
diff.el * lisp/vc/diff.el (diff-sentinel): Go to bob. 2012-04-27 22:16:02 +08:00
ediff-diff.el Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
ediff-help.el
ediff-hook.el
ediff-init.el Use the same diff color scheme as in modern VCSes (bug#10181). 2012-05-25 03:55:40 +03:00
ediff-merg.el
ediff-mult.el
ediff-ptch.el
ediff-util.el Standardize possessive apostrophe usage in manuals, docs, and comments 2012-02-28 00:17:21 -08:00
ediff-vers.el
ediff-wind.el Adapt ediff window handling to multi-tty. 2012-04-26 11:04:36 +08:00
ediff.el Tweaks to Customize interface. Set custom-reset-button-menu to t. 2012-04-22 21:58:00 +08:00
emerge.el Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
log-edit.el Move define-obsolete-variable-alias before the var's definition. 2012-05-12 23:05:06 -04:00
log-view.el
pcvs-defs.el Remove * characters from the front of variable docstrings. 2012-04-09 21:05:48 +08:00
pcvs-info.el
pcvs-parse.el
pcvs-util.el Replace independent implementations of string-prefix-p 2012-04-16 19:57:09 -04:00
pcvs.el Replace independent implementations of string-prefix-p 2012-04-16 19:57:09 -04:00
smerge-mode.el Use the same diff color scheme as in modern VCSes (bug#10181). 2012-05-25 03:55:40 +03:00
vc-annotate.el * lisp/vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal): 2012-04-10 16:08:43 -04:00
vc-arch.el * lisp/vc/vc-mtn.el: 2012-04-25 23:18:47 -04:00
vc-bzr.el * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Save match-data around sha1. 2012-05-18 16:38:37 -04:00
vc-cvs.el * lisp/vc/vc-mtn.el: 2012-04-25 23:18:47 -04:00
vc-dav.el
vc-dir.el * lisp/vc/vc-mtn.el: 2012-04-25 23:18:47 -04:00
vc-dispatcher.el Replace independent implementations of string-prefix-p 2012-04-16 19:57:09 -04:00
vc-git.el Merge changes from emacs-24 branch 2012-04-27 11:10:38 +08:00
vc-hg.el * lisp/vc/vc-mtn.el: 2012-04-25 23:18:47 -04:00
vc-hooks.el
vc-mtn.el * lisp/vc/vc-mtn.el: 2012-04-25 23:18:47 -04:00
vc-rcs.el Add custom groups for VC backends, for consistency with vc-bzr. 2012-02-25 12:29:09 +08:00
vc-sccs.el Add custom groups for VC backends, for consistency with vc-bzr. 2012-02-25 12:29:09 +08:00
vc-svn.el Add custom groups for VC backends, for consistency with vc-bzr. 2012-02-25 12:29:09 +08:00
vc.el * lisp/vc/vc-mtn.el: 2012-04-25 23:18:47 -04:00