Mercurial > emacs
annotate msdos/README @ 65129:8303172e4c68
(smerge-remove-props): Make the args non-optional.
(smerge-keep-n): Remove props.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-kill-current): Don't remove props anymore
now that it's done in smerge-keep-n.
(smerge-refined-change): New face.
(smerge-refine-chopup-region, smerge-refine-highlight-change)
(smerge-refine): New funs.
(smerge-basic-map): Bind smerge-refine.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 25 Aug 2005 20:13:38 +0000 |
parents | 3723093a21fd |
children | 067115a6e738 |
rev | line source |
---|---|
36461
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
1 This directory contains scripts for building the DJGPP (a.k.a. MS-DOS) |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
2 version of Emacs, and other files useful for running that version of |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
3 Emacs. |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
4 |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
5 The files emacs.ico and emacs.pif are for using the DJGPP version on |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
6 Windows 3.X. Since these are binary files, their copyright notice is |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
7 reproduced here: |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
8 |
64890
3723093a21fd
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
36461
diff
changeset
|
9 # Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
36461
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
10 # |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
11 # This file is part of GNU Emacs. |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
12 # |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
13 # This file is free software; as a special exception, the author gives |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
14 # unlimited permission to copy and/or distribute it, with or without |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
15 # modifications, as long as this notice is preserved. |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
16 # |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
17 # This program is distributed in the hope that it will be useful, |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
18 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
20 # |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
21 # ---------------------------------------------------------------------- |
a4fb0c9be609
Add copyright notices for all files. README is a new file, mainly
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
22 |