/[emacs]/emacs/lisp/diff-mode.el
ViewVC logotype

Diff of /emacs/lisp/diff-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.71 by lektu, Thu May 19 19:06:18 2005 UTC revision 1.72 by lute, Fri May 20 13:35:11 2005 UTC
# Line 185  when editing big diffs)." Line 185  when editing big diffs)."
185      (((class color) (background dark))      (((class color) (background dark))
186       :foreground "green" :weight bold)       :foreground "green" :weight bold)
187      (t :weight bold))      (t :weight bold))
188    "`diff-mode' face inherited by hunk and index header faces.")    "`diff-mode' face inherited by hunk and index header faces."
189      :group 'diff-mode)
190  (defvar diff-header-face 'diff-header-face)  (defvar diff-header-face 'diff-header-face)
191    
192  (defface diff-file-header-face  (defface diff-file-header-face
# Line 198  when editing big diffs)." Line 199  when editing big diffs)."
199      (((class color) (background dark))      (((class color) (background dark))
200       :foreground "cyan" :weight bold)       :foreground "cyan" :weight bold)
201      (t :weight bold))                   ; :height 1.3      (t :weight bold))                   ; :height 1.3
202    "`diff-mode' face used to highlight file header lines.")    "`diff-mode' face used to highlight file header lines."
203      :group 'diff-mode)
204  (defvar diff-file-header-face 'diff-file-header-face)  (defvar diff-file-header-face 'diff-file-header-face)
205    
206  (defface diff-index-face  (defface diff-index-face
207    '((t :inherit diff-file-header-face))    '((t :inherit diff-file-header-face))
208    "`diff-mode' face used to highlight index header lines.")    "`diff-mode' face used to highlight index header lines."
209      :group 'diff-mode)
210  (defvar diff-index-face 'diff-index-face)  (defvar diff-index-face 'diff-index-face)
211    
212  (defface diff-hunk-header-face  (defface diff-hunk-header-face
213    '((t :inherit diff-header-face))    '((t :inherit diff-header-face))
214    "`diff-mode' face used to highlight hunk header lines.")    "`diff-mode' face used to highlight hunk header lines."
215      :group 'diff-mode)
216  (defvar diff-hunk-header-face 'diff-hunk-header-face)  (defvar diff-hunk-header-face 'diff-hunk-header-face)
217    
218  (defface diff-removed-face  (defface diff-removed-face
219    '((t :inherit diff-changed-face))    '((t :inherit diff-changed-face))
220    "`diff-mode' face used to highlight removed lines.")    "`diff-mode' face used to highlight removed lines."
221      :group 'diff-mode)
222  (defvar diff-removed-face 'diff-removed-face)  (defvar diff-removed-face 'diff-removed-face)
223    
224  (defface diff-added-face  (defface diff-added-face
225    '((t :inherit diff-changed-face))    '((t :inherit diff-changed-face))
226    "`diff-mode' face used to highlight added lines.")    "`diff-mode' face used to highlight added lines."
227      :group 'diff-mode)
228  (defvar diff-added-face 'diff-added-face)  (defvar diff-added-face 'diff-added-face)
229    
230  (defface diff-changed-face  (defface diff-changed-face
# Line 226  when editing big diffs)." Line 232  when editing big diffs)."
232       :foreground "magenta" :weight bold :slant italic)       :foreground "magenta" :weight bold :slant italic)
233      (((type tty pc) (class color) (background dark))      (((type tty pc) (class color) (background dark))
234       :foreground "yellow" :weight bold :slant italic))       :foreground "yellow" :weight bold :slant italic))
235    "`diff-mode' face used to highlight changed lines.")    "`diff-mode' face used to highlight changed lines."
236      :group 'diff-mode)
237  (defvar diff-changed-face 'diff-changed-face)  (defvar diff-changed-face 'diff-changed-face)
238    
239  (defface diff-function-face  (defface diff-function-face
240    '((t :inherit diff-context-face))    '((t :inherit diff-context-face))
241    "`diff-mode' face used to highlight function names produced by \"diff -p\".")    "`diff-mode' face used to highlight function names produced by \"diff -p\"."
242      :group 'diff-mode)
243  (defvar diff-function-face 'diff-function-face)  (defvar diff-function-face 'diff-function-face)
244    
245  (defface diff-context-face  (defface diff-context-face
# Line 239  when editing big diffs)." Line 247  when editing big diffs)."
247       :foreground "grey50")       :foreground "grey50")
248      (((class color) (background dark))      (((class color) (background dark))
249       :foreground "grey70"))       :foreground "grey70"))
250    "`diff-mode' face used to highlight context and other side-information.")    "`diff-mode' face used to highlight context and other side-information."
251      :group 'diff-mode)
252  (defvar diff-context-face 'diff-context-face)  (defvar diff-context-face 'diff-context-face)
253    
254  (defface diff-nonexistent-face  (defface diff-nonexistent-face
255    '((t :inherit diff-file-header-face))    '((t :inherit diff-file-header-face))
256    "`diff-mode' face used to highlight nonexistent files in recursive diffs.")    "`diff-mode' face used to highlight nonexistent files in recursive diffs."
257      :group 'diff-mode)
258  (defvar diff-nonexistent-face 'diff-nonexistent-face)  (defvar diff-nonexistent-face 'diff-nonexistent-face)
259    
260  (defconst diff-yank-handler '(diff-yank-function))  (defconst diff-yank-handler '(diff-yank-function))

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26