Mercurial > emacs

comparison lisp/smerge-mode.el @ 32164:a3d5adc99010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face): Add dark-background variants.
author Miles Bader <miles@gnu.org>
date Thu, 05 Oct 2000 06:05:51 +0000
parents f7b06560383b
children 44f7f2635fec
comparison
equal deleted inserted replaced
32163:86c35611262a 32164:a3d5adc99010
1 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts 1 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
2 2
3 ;; Copyright (C) 1999 Free Software Foundation, Inc. 3 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
4 4
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> 5 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
6 ;; Keywords: merge diff3 cvs conflict 6 ;; Keywords: merge diff3 cvs conflict
7 ;; Revision: $Id: smerge-mode.el,v 1.4 2000/07/21 13:52:19 fx Exp $ 7 ;; Revision: $Id: smerge-mode.el,v 1.5 2000/08/16 19:51:55 monnier Exp $
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.
10 10
11 ;; GNU Emacs is free software; you can redistribute it and/or modify 11 ;; GNU Emacs is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by 12 ;; it under the terms of the GNU General Public License as published by
75 "*Non-nil means to leave `smerge-mode' when the last conflict is resolved." 75 "*Non-nil means to leave `smerge-mode' when the last conflict is resolved."
76 :group 'smerge 76 :group 'smerge
77 :type 'boolean) 77 :type 'boolean)
78 78
79 (defface smerge-mine-face 79 (defface smerge-mine-face
80 '((t (:foreground "blue"))) 80 '((((background light))
81 (:foreground "blue"))
82 (((background dark))
83 (:foreground "cyan")))
81 "Face for your code." 84 "Face for your code."
82 :group 'smerge) 85 :group 'smerge)
83 (defvar smerge-mine-face 'smerge-mine-face) 86 (defvar smerge-mine-face 'smerge-mine-face)
84 87
85 (defface smerge-other-face 88 (defface smerge-other-face
86 '((t (:foreground "darkgreen"))) 89 '((((background light))
90 (:foreground "darkgreen"))
91 (((background dark))
92 (:foreground "lightgreen")))
87 "Face for the other code." 93 "Face for the other code."
88 :group 'smerge) 94 :group 'smerge)
89 (defvar smerge-other-face 'smerge-other-face) 95 (defvar smerge-other-face 'smerge-other-face)
90 96
91 (defface smerge-base-face 97 (defface smerge-base-face
92 '((t (:foreground "red"))) 98 '((((background light))
99 (:foreground "red"))
100 (((background dark))
101 (:foreground "orange")))
93 "Face for the base code." 102 "Face for the base code."
94 :group 'smerge) 103 :group 'smerge)
95 (defvar smerge-base-face 'smerge-base-face) 104 (defvar smerge-base-face 'smerge-base-face)
96 105
97 (defface smerge-markers-face 106 (defface smerge-markers-face
98 '((t (:background "grey85"))) 107 '((((background light))
108 (:background "grey85"))
109 (((background dark))
110 (:background "grey30")))
99 "Face for the conflict markers." 111 "Face for the conflict markers."
100 :group 'smerge) 112 :group 'smerge)
101 (defvar smerge-markers-face 'smerge-markers-face) 113 (defvar smerge-markers-face 'smerge-markers-face)
102 114
103 (easy-mmode-defmap smerge-basic-map 115 (easy-mmode-defmap smerge-basic-map
458 470
459 (provide 'smerge-mode) 471 (provide 'smerge-mode)
460 472
461 ;;; Change Log: 473 ;;; Change Log:
462 ;; $Log: smerge-mode.el,v $ 474 ;; $Log: smerge-mode.el,v $
475 ;; Revision 1.5 2000/08/16 19:51:55 monnier
476 ;; (smerge-mode-menu): Doc fix.
477 ;;
463 ;; Revision 1.4 2000/07/21 13:52:19 fx 478 ;; Revision 1.4 2000/07/21 13:52:19 fx
464 ;; (smerge-mode-menu): Fill it out. 479 ;; (smerge-mode-menu): Fill it out.
465 ;; 480 ;;
466 ;; Revision 1.3 2000/05/25 18:08:26 fx 481 ;; Revision 1.3 2000/05/25 18:08:26 fx
467 ;; (smerge-diff-switches): Don't use list* in defcustom. 482 ;; (smerge-diff-switches): Don't use list* in defcustom.