[Emacs-diffs] /srv/bzr/emacs/trunk r102841: * admin/bzrmerge.el: Require cl when compiling.

[Glenn Morris]

------------------------------------------------------------
revno: 102841
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-01-13 18:44:25 -0800
message:
  * admin/bzrmerge.el: Require cl when compiling.
  (bzrmerge-merges): Doc fix.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-01-07 20:42:11 +0000
+++ b/admin/ChangeLog   2011-01-14 02:44:25 +0000
@@ -1,3 +1,8 @@
+2011-01-14  Glenn Morris  <address@hidden>
+
+       * bzrmerge.el: Require cl when compiling.
+       (bzrmerge-merges): Doc fix.
+
 2011-01-07  Paul Eggert  <address@hidden>
 
        * 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

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-01-12 04:28:12 +0000
+++ b/admin/bzrmerge.el 2011-01-14 02:44:25 +0000
@@ -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)