Module Name:	pkgsrc
Committed By:	uebayasi
Date:		Fri Apr 11 00:34:27 UTC 2003

Update of /cvsroot/pkgsrc/editors/emacs
In directory minbar.netbsd.org:/tmp/cvs-serv21637

Log Message:
Re-import of Emacs 21, which has settled down in editors/emacs21.


Vendor Tag:	TNF
Release Tags:	pkgsrc-base
		
C pkgsrc/editors/emacs/Makefile
C pkgsrc/editors/emacs/DESCR
C pkgsrc/editors/emacs/distinfo
C pkgsrc/editors/emacs/PLIST
N pkgsrc/editors/emacs/files/site-init.el
C pkgsrc/editors/emacs/patches/patch-aa
C pkgsrc/editors/emacs/patches/patch-ad
C pkgsrc/editors/emacs/patches/patch-ae
C pkgsrc/editors/emacs/patches/patch-ak
N pkgsrc/editors/emacs/patches/patch-xx

8 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jTNF:yesterday -jTNF pkgsrc/editors/emacs