| 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'.
|
| Fri, 22 Dec 2000 22:58:57 +0000 |
Stefan Monnier |
(smerge-basic-map): Use `=' rather than `d'.
|
| Fri, 06 Oct 2000 16:07:31 +0000 |
Stefan Monnier |
(smerge-diff): Setup the buffer's default-directory
|
| Thu, 05 Oct 2000 06:05:51 +0000 |
Miles Bader |
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
|
| Wed, 16 Aug 2000 19:51:55 +0000 |
Stefan Monnier |
(smerge-mode-menu): Doc fix.
|
| Fri, 21 Jul 2000 13:52:19 +0000 |
Dave Love |
(smerge-mode-menu): Fill it out.
|
| Thu, 25 May 2000 18:08:26 +0000 |
Dave Love |
(smerge-diff-switches): Don't use list* in defcustom.
|
| Wed, 22 Mar 2000 00:54:55 +0000 |
Stefan Monnier |
(smerge-auto-leave): New function and variable.
|
| Thu, 09 Dec 1999 13:00:21 +0000 |
Stefan Monnier |
New file. Provides a simple minor-mode for files containing
|
