# HG changeset patch # User Lute Kamstra # Date 1113469356 0 # Node ID 1926d92f781e9e1c0e9ab2041f49ecc9cb7240c0 # Parent ffa21905c7e9963c7804c11aeb8a9f5e99b155f9 (add-release-logs): Fix require call. diff -r ffa21905c7e9 -r 1926d92f781e admin/admin.el --- a/admin/admin.el Thu Apr 14 08:40:39 2005 +0000 +++ b/admin/admin.el Thu Apr 14 09:02:36 2005 +0000 @@ -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 @@ (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 @@ (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 @@ (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 @@ (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."