diff options
| author | Miles Bader <miles@gnu.org> | 2005-04-09 02:16:29 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-04-09 02:16:29 +0000 |
| commit | 768d4533ce51d61ce065b28f63aae43c7be0d1cc (patch) | |
| tree | fb2d103d5c9354b3a15550b160bba0ff2e22c418 /lisp/smerge-mode.el | |
| parent | 918bcc18650840562677f841aa0bcaa34a069be5 (diff) | |
| parent | 2a9e192d3815d2c34fdd41d52590027805bc9055 (diff) | |
| download | emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.tar.gz emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.tar.bz2 emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 35903dcf749..0cab4b31404 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,6 +1,6 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999, 2000, 01, 03, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: revision-control merge diff3 cvs conflict @@ -76,8 +76,12 @@ Used in `smerge-diff-base-mine' and related functions." :type 'boolean) (defface smerge-mine-face - '((((background light)) + '((((min-colors 88) (background light)) + (:foreground "blue1")) + (((background light)) (:foreground "blue")) + (((min-colors 88) (background dark)) + (:foreground "cyan1")) (((background dark)) (:foreground "cyan"))) "Face for your code." @@ -94,7 +98,9 @@ Used in `smerge-diff-base-mine' and related functions." (defvar smerge-other-face 'smerge-other-face) (defface smerge-base-face - '((((background light)) + '((((min-colors 88) (background light)) + (:foreground "red1")) + (((background light)) (:foreground "red")) (((background dark)) (:foreground "orange"))) @@ -667,7 +673,7 @@ buffer names." (define-minor-mode smerge-mode "Minor mode to simplify editing output from the diff3 program. \\{smerge-mode-map}" - nil " SMerge" nil + :group 'smerge :lighter " SMerge" (when (and (boundp 'font-lock-mode) font-lock-mode) (set (make-local-variable 'font-lock-multiline) t) (save-excursion |