diff options
| author | Miles Bader | 2006-11-21 08:56:38 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-11-21 08:56:38 +0000 |
| commit | eeb7eaa88482114822730380196f4e7a3c0870dd (patch) | |
| tree | e8c3861b628ad53c6b8f158b74d1be8bd8590aeb /admin | |
| parent | b15d6f4265b10fbc413caca03246feff9c87d53e (diff) | |
| parent | a98d0b8e8948293de119c4cdd7a8c79318ad82fa (diff) | |
| download | emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.tar.gz emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 1 | ||||
| -rw-r--r-- | admin/FOR-RELEASE | 6 | ||||
| -rw-r--r-- | admin/make-tarball.txt | 11 |
3 files changed, 10 insertions, 8 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 8074b5340cd..b60edd3bea9 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -392,6 +392,7 @@ | |||
| 392 | 392 | ||
| 393 | ;; Local Variables: | 393 | ;; Local Variables: |
| 394 | ;; coding: iso-2022-7bit | 394 | ;; coding: iso-2022-7bit |
| 395 | ;; add-log-time-zone-rule: t | ||
| 395 | ;; End: | 396 | ;; End: |
| 396 | 397 | ||
| 397 | Copyright (C) 2001 Free Software Foundation, Inc. | 398 | Copyright (C) 2001 Free Software Foundation, Inc. |
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index aa3f264748e..68a6038cbdd 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE | |||
| @@ -43,11 +43,11 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem. | |||
| 43 | 43 | ||
| 44 | * BUGS | 44 | * BUGS |
| 45 | 45 | ||
| 46 | ** triska@gmx.at, Nov 2: EMACS environment variable. | 46 | ** Document use of gpg-agent |
| 47 | 47 | ||
| 48 | ** offby1@blarg.net, Nov 5: calendar gets wrong end for Daylight Savings Time | 48 | ** seltenreich@gmx.de, Nov 19: Failed assertion on make-frame-on-display |
| 49 | 49 | ||
| 50 | ** CC mode defun-finding issues. | 50 | ** jbuehler@spirentcom.com, Nov 20: AIX 5.2 loadup failure |
| 51 | 51 | ||
| 52 | * DOCUMENTATION | 52 | * DOCUMENTATION |
| 53 | 53 | ||
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 9b15f8d39b3..e56c26571d9 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt | |||
| @@ -21,11 +21,12 @@ For each step, check for possible errors. | |||
| 21 | 21 | ||
| 22 | 5. rm configure; make bootstrap | 22 | 5. rm configure; make bootstrap |
| 23 | 23 | ||
| 24 | 6. Commit configure, README, AUTHORS, lisp/cus-load.el, | 24 | 6. Commit configure, README, AUTHORS, lisp/finder-inf.el, |
| 25 | lisp/finder-inf.el, lisp/version.el, man/emacs.texi, | 25 | lisp/version.el, man/emacs.texi, lispref/elisp.texi, |
| 26 | lispref/elisp.texi. Copy lisp/loaddefs.el to lisp/ldefs-boot.el | 26 | mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings, |
| 27 | and commit lisp/ldefs-boot.el. For a release, also commit the | 27 | mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to |
| 28 | ChangeLog files in all directories. | 28 | lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. For a release, |
| 29 | also commit the ChangeLog files in all directories. | ||
| 29 | 30 | ||
| 30 | 7. make-dist --snapshot. Check the contents of the new tar with | 31 | 7. make-dist --snapshot. Check the contents of the new tar with |
| 31 | admin/diff-tar-files against an older tar file. Some old pretest | 32 | admin/diff-tar-files against an older tar file. Some old pretest |