* lisp/version.el (emacs-repository-get-version):
Check either .bzr or .git, but not both.
Make the git case actually use the DIR argument, and return nil
rather than the empty string.
* etc/NEWS: Don't mention that emacs-repository-version works for git,
because it only returns nil (since it uses %N and there seem to be no
notes in the git version of the Emacs repo.)
No idea why this change is in trunk during a feature freeze anyway.
* version.el (emacs-repository-get-version): Enhance so the
function works correctly in either a Bazaar or Git repo. The
Bazaar case can be discarded after the repo transition.
* version.el (emacs-bzr-version): Name changed to
emacs-repository-version.
* loadup.el: Follow through on this name change.
* lisp/mail/emacsbug.el (report-emacs-bug): Factor out any
assumption about the version control system in use.
* lisp/version.el (emacs-bzr-version): Doc fix.
(emacs-bzr-version-dirstate): New function.
(emacs-bzr-get-version): For lightweight checkouts, if the parent
is local try and check that it matches the branch. If not, just
use dirstate information.
AFAICS, this is ancient code dating from when there was an "inc-vers.el",
that was used to bump the build number on version.el. Nowadays that
happens in loadup.el.
* lisp/version.el: Remove no-byte-compile and associated formatting.
* lisp/loadup.el: No need to load lisp/version.el uncompiled.
* lisp/version.el (emacs-bzr-get-version): New function.
* lisp/loadup.el (emacs-bzr-version): Set it.
* lisp/mail/emacsbug.el (report-emacs-bug): Include bzr version.
* etc/NEWS: Mention this, though it is not really relevant to releases.
Insert template for 24.2 release.
Fixes: debbugs:8054
* src/emacs.c (emacs_version, emacs_copyright): New string
variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
(syms_of_emacs): Defvar them, and initialize them from the C
string variables.
(main): If initialization hasn't been done, print initial version
info from the C strings, instead of starting an interactive session.
* lisp/version.el (emacs-copyright, emacs-version): Don't define
here.
* configure.in: Look for version string in its new place.
* Cocoa/Emacs.base/Contents/Info.plist:
* Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* GNUstep/Emacs.base/Resources/Info-gnustep.plist:
Set copyright year to 2010.
* version.el (emacs-copyright): Set copyright year to 2010.
* ebrowse.c (version):
* etags.c (print_version):
* rcs2log (Copyright): Set copyright year to 2010.