From 221711eb2335203b863267f915053b5d24dea68e Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 10 Jun 2005 07:43:31 +0000 Subject: [PATCH] Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368 Remove "-face" suffix from diff-mode faces 2005-06-10 Miles Bader * lisp/diff-mode.el (diff-header, diff-file-header, diff-index) (diff-hunk-header, diff-removed, diff-added, diff-changed) (diff-function, diff-context, diff-nonexistent): Remove "-face" suffix from face names. (diff-header-face, diff-file-header-face, diff-index-face) (diff-hunk-header-face, diff-removed-face, diff-added-face) (diff-changed-face, diff-function-face, diff-context-face) (diff-nonexistent-face): New backward-compatibility aliases for renamed faces. (diff-header-face, diff-file-header-face) (diff-index, diff-index-face, diff-hunk-header) (diff-hunk-header-face, diff-removed, diff-removed-face) (diff-added, diff-added-face, diff-changed-face, diff-function) (diff-function-face, diff-context-face, diff-nonexistent) (diff-nonexistent-face): Use renamed diff-mode faces. --- lisp/ChangeLog | 17 +++++++++++++ lisp/diff-mode.el | 72 +++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 63 insertions(+), 26 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab88f6429be..ff79ba52ba5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,22 @@ 2005-06-10 Miles Bader + + * diff-mode.el (diff-header, diff-file-header, diff-index) + (diff-hunk-header, diff-removed, diff-added, diff-changed) + (diff-function, diff-context, diff-nonexistent): Remove "-face" + suffix from face names. + (diff-header-face, diff-file-header-face, diff-index-face) + (diff-hunk-header-face, diff-removed-face, diff-added-face) + (diff-changed-face, diff-function-face, diff-context-face) + (diff-nonexistent-face): New backward-compatibility aliases for + renamed faces. + (diff-header-face, diff-file-header-face) + (diff-index, diff-index-face, diff-hunk-header) + (diff-hunk-header-face, diff-removed, diff-removed-face) + (diff-added, diff-added-face, diff-changed-face, diff-function) + (diff-function-face, diff-context-face, diff-nonexistent) + (diff-nonexistent-face): Use renamed diff-mode faces. + * progmodes/compile.el (compilation-warning-face) (compilation-info-face): Remove "-face" suffix from face names. (compilation-warning-face, compilation-info-face): diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 5deb7880bdf..fa8ef2e1565 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -175,7 +175,7 @@ when editing big diffs)." ;;;; font-lock support ;;;; -(defface diff-header-face +(defface diff-header '((((class color) (min-colors 88) (background light)) :background "grey85") (((class color) (min-colors 88) (background dark)) @@ -187,9 +187,11 @@ when editing big diffs)." (t :weight bold)) "`diff-mode' face inherited by hunk and index header faces." :group 'diff-mode) -(defvar diff-header-face 'diff-header-face) +;; backward-compatibility alias +(put 'diff-header-face 'face-alias 'diff-header) +(defvar diff-header-face 'diff-header) -(defface diff-file-header-face +(defface diff-file-header '((((class color) (min-colors 88) (background light)) :background "grey70" :weight bold) (((class color) (min-colors 88) (background dark)) @@ -201,58 +203,76 @@ when editing big diffs)." (t :weight bold)) ; :height 1.3 "`diff-mode' face used to highlight file header lines." :group 'diff-mode) -(defvar diff-file-header-face 'diff-file-header-face) +;; backward-compatibility alias +(put 'diff-file-header-face 'face-alias 'diff-file-header) +(defvar diff-file-header-face 'diff-file-header) -(defface diff-index-face - '((t :inherit diff-file-header-face)) +(defface diff-index + '((t :inherit diff-file-header)) "`diff-mode' face used to highlight index header lines." :group 'diff-mode) -(defvar diff-index-face 'diff-index-face) +;; backward-compatibility alias +(put 'diff-index-face 'face-alias 'diff-index) +(defvar diff-index-face 'diff-index) -(defface diff-hunk-header-face - '((t :inherit diff-header-face)) +(defface diff-hunk-header + '((t :inherit diff-header)) "`diff-mode' face used to highlight hunk header lines." :group 'diff-mode) -(defvar diff-hunk-header-face 'diff-hunk-header-face) +;; backward-compatibility alias +(put 'diff-hunk-header-face 'face-alias 'diff-hunk-header) +(defvar diff-hunk-header-face 'diff-hunk-header) -(defface diff-removed-face - '((t :inherit diff-changed-face)) +(defface diff-removed + '((t :inherit diff-changed)) "`diff-mode' face used to highlight removed lines." :group 'diff-mode) -(defvar diff-removed-face 'diff-removed-face) +;; backward-compatibility alias +(put 'diff-removed-face 'face-alias 'diff-removed) +(defvar diff-removed-face 'diff-removed) -(defface diff-added-face - '((t :inherit diff-changed-face)) +(defface diff-added + '((t :inherit diff-changed)) "`diff-mode' face used to highlight added lines." :group 'diff-mode) -(defvar diff-added-face 'diff-added-face) +;; backward-compatibility alias +(put 'diff-added-face 'face-alias 'diff-added) +(defvar diff-added-face 'diff-added) -(defface diff-changed-face +(defface diff-changed '((((type tty pc) (class color) (background light)) :foreground "magenta" :weight bold :slant italic) (((type tty pc) (class color) (background dark)) :foreground "yellow" :weight bold :slant italic)) "`diff-mode' face used to highlight changed lines." :group 'diff-mode) -(defvar diff-changed-face 'diff-changed-face) +;; backward-compatibility alias +(put 'diff-changed-face 'face-alias 'diff-changed) +(defvar diff-changed-face 'diff-changed) -(defface diff-function-face - '((t :inherit diff-context-face)) +(defface diff-function + '((t :inherit diff-context)) "`diff-mode' face used to highlight function names produced by \"diff -p\"." :group 'diff-mode) -(defvar diff-function-face 'diff-function-face) +;; backward-compatibility alias +(put 'diff-function-face 'face-alias 'diff-function) +(defvar diff-function-face 'diff-function) -(defface diff-context-face +(defface diff-context '((t :inherit shadow)) "`diff-mode' face used to highlight context and other side-information." :group 'diff-mode) -(defvar diff-context-face 'diff-context-face) +;; backward-compatibility alias +(put 'diff-context-face 'face-alias 'diff-context) +(defvar diff-context-face 'diff-context) -(defface diff-nonexistent-face - '((t :inherit diff-file-header-face)) +(defface diff-nonexistent + '((t :inherit diff-file-header)) "`diff-mode' face used to highlight nonexistent files in recursive diffs." :group 'diff-mode) -(defvar diff-nonexistent-face 'diff-nonexistent-face) +;; backward-compatibility alias +(put 'diff-nonexistent-face 'face-alias 'diff-nonexistent) +(defvar diff-nonexistent-face 'diff-nonexistent) (defconst diff-yank-handler '(diff-yank-function)) (defun diff-yank-function (text) -- 2.11.4.GIT