mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-12 09:51:05 -07:00
bc1b21bb4e
* 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'. |
||
|---|---|---|
| .. | ||
| charsets | ||
| e | ||
| forms | ||
| gnus | ||
| images | ||
| nxml | ||
| org | ||
| refcards | ||
| schema | ||
| srecode | ||
| themes | ||
| tutorials | ||
| .gitignore | ||
| AUTHORS | ||
| celibacy.1 | ||
| CENSORSHIP | ||
| ChangeLog | ||
| compilation.txt | ||
| condom.1 | ||
| CONTRIBUTE | ||
| COOKIES | ||
| COPYING | ||
| copying.paper | ||
| DEBUG | ||
| DEVEL.HUMOR | ||
| DISTRIB | ||
| echo.msg | ||
| edt-user.el | ||
| emacs-buffer.gdb | ||
| emacs.desktop | ||
| emacs.icon | ||
| emacs.py | ||
| emacs2.py | ||
| emacs3.py | ||
| enriched.doc | ||
| ERC-NEWS | ||
| ETAGS.EBNF | ||
| ETAGS.README | ||
| FTP | ||
| future-bug | ||
| GNU | ||
| GNUS-NEWS | ||
| gnus-tut.txt | ||
| grep.txt | ||
| HELLO | ||
| INTERVIEW | ||
| JOKES | ||
| LINUX-GNU | ||
| MACHINES | ||
| MAILINGLISTS | ||
| MH-E-NEWS | ||
| MORE.STUFF | ||
| MOTIVATION | ||
| NEWS | ||
| NEWS.1-17 | ||
| NEWS.18 | ||
| NEWS.19 | ||
| NEWS.20 | ||
| NEWS.21 | ||
| NEWS.22 | ||
| NEWS.23 | ||
| NEXTSTEP | ||
| NXML-NEWS | ||
| ORDERS | ||
| ORG-NEWS | ||
| PROBLEMS | ||
| ps-prin0.ps | ||
| ps-prin1.ps | ||
| publicsuffix.txt | ||
| README | ||
| rgb.txt | ||
| SERVICE | ||
| ses-example.ses | ||
| sex.6 | ||
| spook.lines | ||
| TERMS | ||
| THE-GNU-PROJECT | ||
| TODO | ||
| WHY-FREE | ||
| yow.lines | ||
This directory contains the architecture-independent files used by or with Emacs. This includes some text files of documentation for GNU Emacs or of interest to Emacs users, and the file of dumped docstrings for Emacs functions and variables. `forms-d2.dat' is an example data file used by forms-d2.el. COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.icon Author: Sun Microsystems, Inc Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING)