From 3cc9b1e268be9e2593314c73866a67ba4fa03454 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Jan 2014 18:37:42 +0200 Subject: [PATCH] Revert last commit. --- ChangeLog | 3 --- doc/misc/efaq.texi | 2 ++ etc/CONTRIBUTE | 11 +++++------ lisp/mh-e/mh-acros.el | 12 ++++++------ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b48d2039a4..98681e9c705 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,5 @@ 2014-01-12 Eric S. Raymond - * doc/misc/efaq.texi, etc/CONTRIBUTE, lisp/mh-e/mh-acros.el: - Remove more references unnecessarily specific to VCS. - * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS code, and explain the problem. diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index f17570fbe23..c54423e887e 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -978,6 +978,7 @@ conventions}). @cindex Latest version of Emacs @cindex Development, Emacs @cindex Repository, Emacs +@cindex Bazaar repository, Emacs Emacs @value{EMACSVER} is the current version as of this writing. A version number with two components (e.g., @samp{22.1}) indicates a released @@ -988,6 +989,7 @@ Emacs is under active development, hosted at @uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source code can be retrieved anonymously following the @uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}. +The repository is GNU Bazaar. Because Emacs undergoes many changes before a release, the version number of a development version is not especially meaningful. It is diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index de42a15bb5c..cba833cf584 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE @@ -71,12 +71,11 @@ patches) over all your contributions. * Getting the Source Code -The latest version of Emacs can be fetched from the version-control -repository on the Savannah web site. It is important to write your -patch based on the latest version. If you start from an older -version, your patch may be outdated (so that maintainers will have a -hard time applying it), or changes in Emacs may have made your patch -unnecessary. +The latest version of Emacs can be downloaded using Bazaar from the +Savannah web site. It is important to write your patch based on the +latest version. If you start from an older version, your patch may be +outdated (so that maintainers will have a hard time applying it), or +changes in Emacs may have made your patch unnecessary. After you have downloaded the repository source, you should read the file INSTALL.REPO for build instructions (they differ to some extent from a diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index 6e34559c6c7..7abd16bd832 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -25,16 +25,16 @@ ;;; Commentary: ;; This file contains all macros that are used in more than one file. -;; If you run "make recompile" in the Emacs repository and see the message +;; If you run "make recompile" in Bazaar Emacs and see the message ;; "Source is newer than compiled," it is a sign that macro probably ;; needs to be moved here. ;; Historically, it was so named with a silent "m" so that it would be -;; compiled first. Otherwise, "make recompile" in the Emacs repository -;; would use compiled files with stale macro definitions. Later, -;; no-byte-compile was added to the Local Variables section to avoid -;; this problem and because it's pointless to compile a file full of -;; macros. But we kept the name. +;; compiled first. Otherwise, "make recompile" in Bazaar Emacs would use +;; compiled files with stale macro definitions. Later, no-byte-compile +;; was added to the Local Variables section to avoid this problem and +;; because it's pointless to compile a file full of macros. But we +;; kept the name. ;;; Change Log: -- 2.39.2