[Emacs-diffs] Changes to emacs/admin/admin.el

[Lute Kamstra]

Index: emacs/admin/admin.el
diff -c emacs/admin/admin.el:1.5 emacs/admin/admin.el:1.6
*** emacs/admin/admin.el:1.5    Mon Sep  1 15:44:58 2003
--- emacs/admin/admin.el        Thu Apr 14 09:02:36 2005
***************
*** 1,6 ****
  ;;; admin.el --- utilities for Emacs administration
  
! ;; Copyright (C) 2001 Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
--- 1,6 ----
  ;;; admin.el --- utilities for Emacs administration
  
! ;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
***************
*** 21,28 ****
  
  ;;; Commentary:
  
! ;; add-release-log    add ``Version X released'' change log entries
! ;; set-version                change Emacs version number in source tree.
  
  ;;; Code:
  
--- 21,28 ----
  
  ;;; Commentary:
  
! ;; add-release-logs   Add ``Version X released'' change log entries.
! ;; set-version                Change Emacs version number in source tree.
  
  ;;; Code:
  
***************
*** 43,49 ****
          (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."
--- 43,48 ----
***************
*** 51,58 ****
    (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))
    (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))
--- 50,57 ----
    (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"))
         (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,70 ****
        (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))
--- 63,68 ----
***************
*** 72,78 ****
      (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."
--- 70,75 ----