aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-01-12 18:37:42 +0200
committerEli Zaretskii2014-01-12 18:37:42 +0200
commit3cc9b1e268be9e2593314c73866a67ba4fa03454 (patch)
tree63c8cbe0586579e3371330e576fb5fa5bb5ec750
parentff7210fef52a3ced9ea517c8326164b241cc148b (diff)
downloademacs-3cc9b1e268be9e2593314c73866a67ba4fa03454.tar.gz
emacs-3cc9b1e268be9e2593314c73866a67ba4fa03454.zip
Revert last commit.
-rw-r--r--ChangeLog3
-rw-r--r--doc/misc/efaq.texi2
-rw-r--r--etc/CONTRIBUTE11
-rw-r--r--lisp/mh-e/mh-acros.el12
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 @@
12014-01-12 Eric S. Raymond <esr@thyrsus.com> 12014-01-12 Eric S. Raymond <esr@thyrsus.com>
2 2
3 * doc/misc/efaq.texi, etc/CONTRIBUTE, lisp/mh-e/mh-acros.el:
4 Remove more references unnecessarily specific to VCS.
5
6 * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS 3 * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS
7 code, and explain the problem. 4 code, and explain the problem.
8 5
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}).
978@cindex Latest version of Emacs 978@cindex Latest version of Emacs
979@cindex Development, Emacs 979@cindex Development, Emacs
980@cindex Repository, Emacs 980@cindex Repository, Emacs
981@cindex Bazaar repository, Emacs
981 982
982Emacs @value{EMACSVER} is the current version as of this writing. A version 983Emacs @value{EMACSVER} is the current version as of this writing. A version
983number with two components (e.g., @samp{22.1}) indicates a released 984number with two components (e.g., @samp{22.1}) indicates a released
@@ -988,6 +989,7 @@ Emacs is under active development, hosted at
988@uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source 989@uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source
989code can be retrieved anonymously following the 990code can be retrieved anonymously following the
990@uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}. 991@uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}.
992The repository is GNU Bazaar.
991 993
992Because Emacs undergoes many changes before a release, the version 994Because Emacs undergoes many changes before a release, the version
993number of a development version is not especially meaningful. It is 995number 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.
71 71
72* Getting the Source Code 72* Getting the Source Code
73 73
74The latest version of Emacs can be fetched from the version-control 74The latest version of Emacs can be downloaded using Bazaar from the
75repository on the Savannah web site. It is important to write your 75Savannah web site. It is important to write your patch based on the
76patch based on the latest version. If you start from an older 76latest version. If you start from an older version, your patch may be
77version, your patch may be outdated (so that maintainers will have a 77outdated (so that maintainers will have a hard time applying it), or
78hard time applying it), or changes in Emacs may have made your patch 78changes in Emacs may have made your patch unnecessary.
79unnecessary.
80 79
81After you have downloaded the repository source, you should read the file 80After you have downloaded the repository source, you should read the file
82INSTALL.REPO for build instructions (they differ to some extent from a 81INSTALL.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 @@
25;;; Commentary: 25;;; Commentary:
26 26
27;; This file contains all macros that are used in more than one file. 27;; This file contains all macros that are used in more than one file.
28;; If you run "make recompile" in the Emacs repository and see the message 28;; If you run "make recompile" in Bazaar Emacs and see the message
29;; "Source is newer than compiled," it is a sign that macro probably 29;; "Source is newer than compiled," it is a sign that macro probably
30;; needs to be moved here. 30;; needs to be moved here.
31 31
32;; Historically, it was so named with a silent "m" so that it would be 32;; Historically, it was so named with a silent "m" so that it would be
33;; compiled first. Otherwise, "make recompile" in the Emacs repository 33;; compiled first. Otherwise, "make recompile" in Bazaar Emacs would use
34;; would use compiled files with stale macro definitions. Later, 34;; compiled files with stale macro definitions. Later, no-byte-compile
35;; no-byte-compile was added to the Local Variables section to avoid 35;; was added to the Local Variables section to avoid this problem and
36;; this problem and because it's pointless to compile a file full of 36;; because it's pointless to compile a file full of macros. But we
37;; macros. But we kept the name. 37;; kept the name.
38 38
39;;; Change Log: 39;;; Change Log:
40 40