Mercurial > emacs
changeset 112215:1fd3710e6845
* admin/bzrmerge.el: Require cl when compiling.
(bzrmerge-merges): Doc fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 13 Jan 2011 18:44:25 -0800 |
| parents | 40a246eebab9 |
| children | 7e73e0f65914 63e39d23b102 |
| files | admin/ChangeLog admin/bzrmerge.el |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/ChangeLog Thu Jan 13 21:12:43 2011 -0500 +++ b/admin/ChangeLog Thu Jan 13 18:44:25 2011 -0800 @@ -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
--- a/admin/bzrmerge.el Thu Jan 13 21:12:43 2011 -0500 +++ b/admin/bzrmerge.el Thu Jan 13 18:44:25 2011 -0800 @@ -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)