diff options
| -rw-r--r-- | admin/ChangeLog | 8 | ||||
| -rw-r--r-- | admin/bzrmerge.el | 5 |
2 files changed, 9 insertions, 4 deletions
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) |