* vc-hooks.el (vc-state): Add new state `conflict'.

[bpt/emacs.git] / INSTALL.CVS

diff --git a/INSTALL.CVS b/INSTALL.CVS
index 7e785fc..9416353 100644 (file)
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -1,4 +1,4 @@
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
@@ -31,20 +31,31 @@ once:
 (If you want to install the Emacs binary, type "make install" instead
 of "make" in the last command.)
 
-Occasionally the file "lisp/loaddefs.el" will need be updated to
-reflect new autoloaded functions.  If you see errors about undefined
-lisp functions during compilation, that may be the reason.  Another
-symptom may be an error saying that "loaddefs.el" could not be found;
-this is due to a change in the way loaddefs.el was handled in CVS, and
-should only happen once, for users that are updating old CVS trees.
+Occasionally the file "lisp/loaddefs.el" (and similar *-loaddefs.el
+files in some subdirectories of lisp/, e.g. mh-e/ and calendar/) will
+need to be updated to reflect new autoloaded functions.  If you see
+errors (rather than warnings) about undefined lisp functions during
+compilation, that may be the reason.  Another symptom may be an error
+saying that "loaddefs.el" could not be found; this is due to a change
+in the way loaddefs.el was handled in CVS, and should only happen
+once, for users that are updating old CVS trees.  Finally, sometimes
+there can be build failures related to *loaddefs.el.  In that case,
+delete them before following the instructions below to update them.
 
-To update loaddefs.el, do:
+To update loaddefs.el (and similar files), do:
 
   $ cd lisp
   $ make autoloads EMACS=../src/emacs
 
 If either of the above partial procedures fails, try "make bootstrap".
 
+Very occasionally changes in the source can introduce
+incompatibilities with previous builds.  If a bootstrap fails, as a
+last resort try "make maintainer-clean" before bootstrapping again.
+If CPU time is not an issue, the most thorough way to rebuild, and
+avoid any spurious problems, is always to use "make maintainer-clean;
+make bootstrap".
+
 Users of non-Posix systems (MS-Windows etc.) should run the
 platform-specific configuration scripts (nt/configure.bat, config.bat,
 etc.) before "make bootstrap" or "make"; the rest of the procedure is
@@ -88,7 +99,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,