| Thu, 15 Nov 2001 01:25:35 +0000 |
Stefan Monnier |
(smerge-match-conflict): Fix typo.
|
| Tue, 31 Jul 2001 08:28:43 +0000 |
Gerd Moellmann |
(smerge-mode): Check if `font-lock-mode' is bound
|
| Thu, 10 May 2001 20:23:20 +0000 |
Stefan Monnier |
(smerge-mode): Force font-lock-multiline to t.
|
| Wed, 07 Mar 2001 00:16:29 +0000 |
Stefan Monnier |
(font-lock-keywords, font-lock-mode): Don't bind, just declare.
|
| Thu, 25 Jan 2001 15:36:32 +0000 |
Stefan Monnier |
(smerge-font-lock-keywords): Relax submatch 1.
|
| Sat, 23 Dec 2000 20:54:14 +0000 |
Stefan Monnier |
*** empty log message ***
|
| Fri, 22 Dec 2000 23:16:22 +0000 |
Stefan Monnier |
(smerge-basic-map): Use `=' rather than `d'.
|
