annotate .cvsignore @ 47828:4944e0ddf992

(add-change-log-entry): Don't call find-file at all if we're already in the proper buffer. (change-log-resolve-conflict): New fun. (change-log-mode): Use it and use define-derived-mode. (change-log-merge): Allow other-log to be a buffer. Don't add a \n if there are already enough \n's.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 10 Oct 2002 17:45:17 +0000
parents 32c007e23d05
children f0eb34e60705 d7ddb3e565de
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25839
Dave Love <fx@gnu.org>
parents:
diff changeset
1 configure
27634
6c9ee29e8955 * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents: 25839
diff changeset
2 bin
28195
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
3 boot.log
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
4 boot.log.diff
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
5 boot.log.old
9250c6d6a3b1 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
6 update.log
31816
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
7 config.log
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
8 config.status
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
9 config.cache
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
10 Makefile
070cf4b710c5 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 28195
diff changeset
11 emacs*.tar.gz
35744
497c28f292c4 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 31816
diff changeset
12 leim*.tar.gz
497c28f292c4 *** empty log message ***
Gerd Moellmann <gerd@gnu.org>
parents: 31816
diff changeset
13 *.xdelta
44151
32c007e23d05 Whoops, that should be `autom4te.cache'
Miles Bader <miles@gnu.org>
parents: 44150
diff changeset
14 autom4te.cache