Mercurial > emacs
comparison lisp/smerge-mode.el @ 83310:e58cb448e07c
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364
Remove "-face" suffix from widget faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365
Remove "-face" suffix from custom faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Remove "-face" suffix from change-log faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367
Remove "-face" suffix from compilation faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Remove "-face" suffix from diff-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369
lisp/longlines.el (longlines-visible-face): Face removed
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370
Remove "-face" suffix from woman faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371
Remove "-face" suffix from whitespace-highlight face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372
Remove "-face" suffix from ruler-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373
Remove "-face" suffix from show-paren faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Remove "-face" suffix from log-view faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Remove "-face" suffix from smerge faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376
Remove "-face" suffix from show-tabs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Remove "-face" suffix from highlight-changes faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378
Remove "-face" suffix from and downcase info faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379
Remove "-face" suffix from pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Update uses of renamed pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381
Tweak ChangeLog
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383
Remove "-face" suffix from strokes-char face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
Remove "-face" suffix from compare-windows face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Remove "-face" suffix from calendar faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386
Remove "-face" suffix from diary-button face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387
Remove "-face" suffix from testcover faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388
Remove "-face" suffix from viper faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389
Remove "-face" suffix from org faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390
Remove "-face" suffix from sgml-namespace face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391
Remove "-face" suffix from table-cell face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392
Remove "-face" suffix from tex-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393
Remove "-face" suffix from texinfo-heading face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394
Remove "-face" suffix from flyspell faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397
Remove "-face" suffix from gomoku faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398
Remove "-face" suffix from mpuz faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408
Remove "-face" suffix from Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409
Remove "-face" suffix from antlr-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410
Remove "-face" suffix from ebrowse faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412
Remove "-face" suffix from flymake faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413
Remove "-face" suffix from idlwave faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Remove "-face" suffix from sh-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415
Remove "-face" suffix from vhdl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417
Remove "-face" suffix from which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
Remove "-face" suffix from cperl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419
Remove "-face" suffix from ld-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420
Fix cperl-mode font-lock problem
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421
Tweak which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-350
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 15 Jun 2005 12:57:51 +0000 |
parents | 9deb6323655c 6dde8ad3e1a7 |
children | c016d82bf02b |
comparison
equal
deleted
inserted
replaced
83309:6aee1e9b0bd7 | 83310:e58cb448e07c |
---|---|
73 (defcustom smerge-auto-leave t | 73 (defcustom smerge-auto-leave t |
74 "*Non-nil means to leave `smerge-mode' when the last conflict is resolved." | 74 "*Non-nil means to leave `smerge-mode' when the last conflict is resolved." |
75 :group 'smerge | 75 :group 'smerge |
76 :type 'boolean) | 76 :type 'boolean) |
77 | 77 |
78 (defface smerge-mine-face | 78 (defface smerge-mine |
79 '((((min-colors 88) (background light)) | 79 '((((min-colors 88) (background light)) |
80 (:foreground "blue1")) | 80 (:foreground "blue1")) |
81 (((background light)) | 81 (((background light)) |
82 (:foreground "blue")) | 82 (:foreground "blue")) |
83 (((min-colors 88) (background dark)) | 83 (((min-colors 88) (background dark)) |
84 (:foreground "cyan1")) | 84 (:foreground "cyan1")) |
85 (((background dark)) | 85 (((background dark)) |
86 (:foreground "cyan"))) | 86 (:foreground "cyan"))) |
87 "Face for your code." | 87 "Face for your code." |
88 :group 'smerge) | 88 :group 'smerge) |
89 (defvar smerge-mine-face 'smerge-mine-face) | 89 ;; backward-compatibility alias |
90 | 90 (put 'smerge-mine-face 'face-alias 'smerge-mine) |
91 (defface smerge-other-face | 91 (defvar smerge-mine-face 'smerge-mine) |
92 | |
93 (defface smerge-other | |
92 '((((background light)) | 94 '((((background light)) |
93 (:foreground "darkgreen")) | 95 (:foreground "darkgreen")) |
94 (((background dark)) | 96 (((background dark)) |
95 (:foreground "lightgreen"))) | 97 (:foreground "lightgreen"))) |
96 "Face for the other code." | 98 "Face for the other code." |
97 :group 'smerge) | 99 :group 'smerge) |
98 (defvar smerge-other-face 'smerge-other-face) | 100 ;; backward-compatibility alias |
99 | 101 (put 'smerge-other-face 'face-alias 'smerge-other) |
100 (defface smerge-base-face | 102 (defvar smerge-other-face 'smerge-other) |
103 | |
104 (defface smerge-base | |
101 '((((min-colors 88) (background light)) | 105 '((((min-colors 88) (background light)) |
102 (:foreground "red1")) | 106 (:foreground "red1")) |
103 (((background light)) | 107 (((background light)) |
104 (:foreground "red")) | 108 (:foreground "red")) |
105 (((background dark)) | 109 (((background dark)) |
106 (:foreground "orange"))) | 110 (:foreground "orange"))) |
107 "Face for the base code." | 111 "Face for the base code." |
108 :group 'smerge) | 112 :group 'smerge) |
109 (defvar smerge-base-face 'smerge-base-face) | 113 ;; backward-compatibility alias |
110 | 114 (put 'smerge-base-face 'face-alias 'smerge-base) |
111 (defface smerge-markers-face | 115 (defvar smerge-base-face 'smerge-base) |
116 | |
117 (defface smerge-markers | |
112 '((((background light)) | 118 '((((background light)) |
113 (:background "grey85")) | 119 (:background "grey85")) |
114 (((background dark)) | 120 (((background dark)) |
115 (:background "grey30"))) | 121 (:background "grey30"))) |
116 "Face for the conflict markers." | 122 "Face for the conflict markers." |
117 :group 'smerge) | 123 :group 'smerge) |
118 (defvar smerge-markers-face 'smerge-markers-face) | 124 ;; backward-compatibility alias |
125 (put 'smerge-markers-face 'face-alias 'smerge-markers) | |
126 (defvar smerge-markers-face 'smerge-markers) | |
119 | 127 |
120 (easy-mmode-defmap smerge-basic-map | 128 (easy-mmode-defmap smerge-basic-map |
121 `(("n" . smerge-next) | 129 `(("n" . smerge-next) |
122 ("p" . smerge-prev) | 130 ("p" . smerge-prev) |
123 ("r" . smerge-resolve) | 131 ("r" . smerge-resolve) |