Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-246
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-247
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-249
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-250
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-251
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-252
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-253
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-255
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-257
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-258
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-259
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-260
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-261
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-262
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-263
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-264
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-265
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
   (mm-string-to-multibyte): Use Gnus trunk definition.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-328

1 files changed, 4 insertions, 7 deletions

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."