Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 258-271)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 66)

   - Update from CVS

5 files changed, 30 insertions, 54 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index c3c65379a16..03f5e0ed066 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-19  Lute Kamstra  <lute@gnu.org>
+
+        * make-tarball.txt: Don't commit lisp/loaddefs.el.
+
+2005-04-14  Lute Kamstra  <lute@gnu.org>
+
+        * nt/makedist.bat (elfiles): Update.
+
+        * admin.el (add-release-logs): Fix require call.
+
 2005-03-30  Marcelo Toledo  <marcelo@marcelotoledo.org>
 
         * FOR-RELEASE (Documentation): Added check the Emacs Tutorial. The
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 0c1f4cf5f2f..4fd9caa721a 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -82,42 +82,6 @@ A fix would be to somehow disable handling of display properties if an error
 is encountered.
 
 
-** custom mode-line face makes Emacs freeze up
-
-From: Stephen Berman <Stephen.Berman@gmx.net>
-Date: Sun, 24 Oct 2004 02:08:56 +0200
-
-1. Start Emacs with -q -no-site-file.
-
-2. Type `M-x customize-face' and at the prompt `mode-line'.
-
-3. In the Custom buffer for mode-line face
-   a. check width and give it the value `narrow';
-   b. check height and give it the value 120 in 1/10 pt;
-   c. check underline and give it the value `on' (or `colored');
-   d. check overline and give it the value `on' (or `colored').
-
-4. Set for current session.
-
-5. Invoke Ediff on any two files.
-
-6. Now Emacs is frozen and consumes 95-99% of CPU.
-
-The customizations in step 3 appear to be the minimum necessary to
-induce this bug.  Leave out any one of them and Ediff runs without a
-problem.  Also if the 1/10 point value of height is 130 or greater
-there's no bug (with the default font family; with e.g. Helvetica the
-bug is induced only by a value of 100 or less).
-
-I've noticed this freeze up only when invoking Ediff.  The only thing
-I've been able to do is kill Emacs externally, via top or with kill
-when run in gdb, after interrupting.  When the freeze up happens
-within a gdb session, there is no automatic debugging feedback.  After
-interrupting I can get a backtrace, here's an example:
-
-Update: Maybe only reveals itself when compiled with GTK+
-
-
 * DOCUMENTATION
 
 ** Document Custom Themes.
@@ -274,11 +238,11 @@ etc/TUTORIAL.nl		 Lute Kamstra
 etc/TUTORIAL.pl
 etc/TUTORIAL.pt_BR       Marcelo Toledo
 etc/TUTORIAL.ro
-etc/TUTORIAL.ru
+etc/TUTORIAL.ru          Alex Ott <alexott@gmail.com>
 etc/TUTORIAL.sk          Pavel Janík <Pavel@Janik.cz>
 etc/TUTORIAL.sl          Primoz PETERLIN <primoz.peterlin@biofiz.mf.uni-lj.si>
 etc/TUTORIAL.sv          Mats Lidell <matsl@contactor.se>
-etc/TUTORIAL.th
+etc/TUTORIAL.th          Virach Sornlertlamvanich <virach@tcllab.org>
 etc/TUTORIAL.zh
 
 
diff --git a/admin/admin.el b/admin/admin.el
index 8048ccc78e0..44fbd8ed543 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -21,8 +21,8 @@
 
 ;;; Commentary:
 
-;; add-release-log      add ``Version X released'' change log entries
-;; set-version          change Emacs version number in source tree.
+;; add-release-logs     Add ``Version X released'' change log entries.
+;; set-version          Change Emacs version number in source tree.
 
 ;;; Code:
 
@@ -43,7 +43,6 @@ Signal an error if the program returns with a non-zero exit status."
           (forward-line 1))
         (nreverse lines)))))
 
-
 (defun add-release-logs (root version)
   "Add \"Version VERSION released.\" change log entries in ROOT.
 Root must be the root of an Emacs source tree."
@@ -51,8 +50,8 @@ Root must be the root of an Emacs source tree."
   (setq root (expand-file-name root))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
+  (require 'add-log)
   (let* ((logs (process-lines "find" root "-name" "ChangeLog"))
-         (require 'add-log)
          (entry (format "%s  %s  <%s>\n\n\t* Version %s released.\n\n"
                         (funcall add-log-time-format)
                         (or add-log-full-name (user-full-name))
@@ -64,7 +63,6 @@ Root must be the root of an Emacs source tree."
         (goto-char (point-min))
         (insert entry)))))
 
-
 (defun set-version-in-file (root file version rx)
   (find-file (expand-file-name file root))
   (goto-char (point-min))
@@ -72,7 +70,6 @@ Root must be the root of an Emacs source tree."
     (error "Version not found in %s" file))
   (replace-match (format "%s" version) nil nil nil 1))
 
-
 (defun set-version (root version)
   "Set Emacs version to VERSION in relevant files under ROOT.
 Root must be the root of an Emacs source tree."
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 30f5dc33082..4ca4a21feab 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -21,10 +21,11 @@ For each step, check for possible errors.
 
 5.   rm configure; make bootstrap
 
-6.  Commit configure, README, AUTHORS, lisp/loaddefs.el,
-    lisp/cus-load.el, lisp/finder-inf.el, lisp/version.el,
-    man/emacs.texi.  For a release, also commit the ChangeLog files in
-    all directories.
+6.  Commit configure, README, AUTHORS, lisp/cus-load.el,
+    lisp/finder-inf.el, lisp/version.el, man/emacs.texi.
+    Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit
+    lisp/ldefs-boot.el.  For a release, also commit the ChangeLog
+    files in all directories.
 
 7.   make-dist --snapshot.  Check the contents of the new tar with
      admin/diff-tar-files against an older tar file.  Some old pretest
@@ -34,12 +35,12 @@ For each step, check for possible errors.
 8.   xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
 
 9.   tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
-     configure && make && make -n install
+     ./configure && make && make -n install
     Use `script' or M-x compile to save the compilation log in
     compile-NEW.log and compare it against an old one.  The easiest way
     to do that is to visit the old log in Emacs, change the version
     number of the old Emacs to __, do the same with the new log and do
-    M-x ediff. Especially check that Info files aren't built.
+    M-x ediff.  Especially check that Info files aren't built.
 
 10.  cd EMACS_ROOT_DIR; cvs tag TAG
     TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index d48e6736004..db9d9026aec 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -26,9 +26,14 @@ if not (%4) == () goto end
 
 set eld=emacs-%1/lisp
 
-rem Keep this list in sync with the DONTCOMPILE list in lisp/makefile.w32-in
+rem List of Lisp files that are not compiled and that should be
+rem included in the bin distribution.
 
-set elfiles=%eld%/cus-load.el %eld%/cus-start.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-maint.el %eld%/eshell/esh-groups.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.el %eld%/generic-x.el %eld%/international/latin-1.el %eld%/international/latin-2.el %eld%/international/latin-3.el %eld%/international/latin-4.el %eld%/international/latin-5.el %eld%/international/latin-8.el %eld%/international/latin-9.el %eld%/international/mule-conf.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/version.el
+rem It would be better to generate this list automatically.  It is the
+rem list of all .el files for which there is no corresponding .elc
+rem file, minus ldefs-boot.el.  --lute
+
+set elfiles=%eld%/cus-load.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-groups.el %eld%/eshell/esh-maint.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.el %eld%/international/latin-1.el %eld%/international/latin-2.el %eld%/international/latin-3.el %eld%/international/latin-4.el %eld%/international/latin-5.el %eld%/international/latin-8.el %eld%/international/latin-9.el %eld%/international/mule-conf.el %eld%/language/czech.el %eld%/language/devanagari.el %eld%/language/english.el %eld%/language/georgian.el %eld%/language/greek.el %eld%/language/hebrew.el %eld%/language/japanese.el %eld%/language/kannada.el %eld%/language/korean.el %eld%/language/lao.el %eld%/language/malayalam.el %eld%/language/misc-lang.el %eld%/language/romanian.el %eld%/language/slovak.el %eld%/language/tamil.el %eld%/language/thai.el %eld%/language/utf-8-lang.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/mh-e/mh-acros.el %eld%/mh-e/mh-gnus.el %eld%/mh-e/mh-loaddefs.el %eld%/obsolete/keyswap.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/term/AT386.el %eld%/term/apollo.el %eld%/term/bobcat.el %eld%/term/internal.el %eld%/term/iris-ansi.el %eld%/term/linux.el %eld%/term/lk201.el %eld%/term/news.el %eld%/term/vt102.el %eld%/term/vt125.el %eld%/term/vt200.el %eld%/term/vt201.el %eld%/term/vt220.el %eld%/term/vt240.el %eld%/term/vt300.el %eld%/term/vt320.el %eld%/term/vt400.el %eld%/term/vt420.el %eld%/term/wyse50.el %eld%/version.el
 
 set fns_el=
 for %%f in (emacs-%1/bin/fns*) do set fns_el=%fns_el% emacs-%1/bin/%%f
@@ -42,7 +47,6 @@ for %%f in (emacs-%1/bin/fns*) do echo emacs-%1/bin/%%f>>#elfiles#
 for %%f in (emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp) do echo %%f>>#files#
 for %%f in (emacs-%1/lock emacs-%1/site-lisp) do echo %%f>>#files#
 for %%f in (%elfiles% emacs-%1/site-lisp/subdirs.el) do echo %%f>>#elfiles#
-for %%f in (%eld%/term/*.el) do echo %eld%/term/%%f>>#elfiles#
 
 %TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude "*.el" --exclude "*~" -T #files# -cvf %2-bin-i386.tar
 %TAR% -T #elfiles# -rvf %2-bin-i386.tar