diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-10-31 11:03:23 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-10-31 11:03:23 +0200 |
| commit | cac77f92e3861e81d5fe96b4b857fd9d243032e2 (patch) | |
| tree | a8a9ae3aebf4c4c2be2957a06a76730b31a879bd /lisp | |
| parent | 792faabe7a17a8f2fc2dd21076b69de2fc3edb65 (diff) | |
| download | emacs-cac77f92e3861e81d5fe96b4b857fd9d243032e2.tar.gz | |
Backport changes in preparation for git migration from trunk.
admin: Changes in several documents.
autogen.sh: Neutralize language specific to a repository type.
doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.
doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.
lisp/Makefile.in: Change some production names so they're neutral
about the repository type.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 6 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 6 | ||||
| -rw-r--r-- | lisp/man.el | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bed0928f68f..d0bdb2a1dc9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-31 Eric S. Raymond <esr@thyrsus.com> + + * Makefile.in: Change some production names so they're neutral + about the repository type. + 2014-10-30 Kim F. Storm <storm@cua.dk> Restore cua-delete-copy-to-register-0 and M-v command (bug#18886). diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 5e42cd16bfc..d90ced0cdcb 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -206,18 +206,18 @@ update-subdirs: doit $(srcdir)/../build-aux/update-subdirs $$file; \ done; -.PHONY: updates bzr-update update-authors +.PHONY: updates repo-update update-authors # Some modes of make-dist use this. updates: update-subdirs autoloads finder-data custom-deps -# This is useful after "bzr up"; but it doesn't do anything that a +# This is useful after a repostiory fetch; but it doesn't do anything that a # plain "make" at top-level doesn't. # The only difference between this and this directory's "all" rule # is that this runs "autoloads" as well (because it uses "compile" # rather than "compile-main"). In a bootstrap, $(lisp) in src/Makefile # triggers this directory's autoloads rule. -bzr-update: compile finder-data custom-deps +repo-update: compile finder-data custom-deps # Update the AUTHORS file. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index cb2a1b4e4bb..08a4219ee6b 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -257,11 +257,11 @@ update-subdirs-SH: doit updates: $(lisp)/subdirs.el autoloads mh-autoloads finder-data custom-deps -# This is useful after "bzr up". -bzr-update: recompile autoloads finder-data custom-deps +# This is useful after a repository fetch. +repo-update: recompile autoloads finder-data custom-deps # For backwards compatibility: -cvs-update: bzr-update +cvs-update: repo-update # Update the AUTHORS file. diff --git a/lisp/man.el b/lisp/man.el index 7a095981ebd..ee78423a270 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -840,7 +840,7 @@ foo[, bar [, ...]] [other stuff] (sec) - description foo(sec)[, bar(sec) [, ...]] [other stuff] - description For more details and some regression tests, please see -test/automated/man-tests.el in the emacs bzr repository." +test/automated/man-tests.el in the emacs repository." (goto-char (point-min)) ;; See man-tests for data about which systems use which format (hopefully we ;; will be able to simplify the code if/when some of those formats aren't |