From: Glenn Morris <rgm@gnu.org>
Date: Fri, 14 Jan 2011 02:44:25 +0000 (-0800)
Subject: * admin/bzrmerge.el: Require cl when compiling.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~234^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1851cac3e352fdc84b81a77cdd05b31d2149a04d;p=emacs.git

* admin/bzrmerge.el: Require cl when compiling.
(bzrmerge-merges): Doc fix.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 07ed0179db0..e0059664aba 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+
+	* bzrmerge.el: Require cl when compiling.
+	(bzrmerge-merges): Doc fix.
+
 2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* notes/copyright: There's only one install-sh, not two, so fix a
@@ -989,7 +994,6 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
@@ -1009,5 +1013,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index d725f8a559a..ca10d2a87a2 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -24,8 +24,11 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl))                        ; assert
+
 (defun bzrmerge-merges ()
-  "Return the list of already merged (not not committed) revisions.
+  "Return the list of already merged (not yet committed) revisions.
 The list returned is sorted by oldest-first."
   (with-current-buffer (get-buffer-create "*bzrmerge*")
     (erase-buffer)