#
# patch "ChangeLog"
#  from [9d83c8952ebabe9316c0e9cee711350fdb8cc004]
#    to [05e8ffc7a1bf3e27ca62368bd224c221014f2bab]
#
# patch "contrib/colorize"
#  from [6d186a777205d4a1bae5b7fc7b6bf52fc6d83df5]
#    to [8993ffb22250247bfe0bc2c746b4a197264f3fff]
#
# patch "contrib/monotone.el"
#  from [dc3c1211a531746927242f54befc07788919a112]
#    to [e4dab598c21173cb6b46320982cb2f115e88cea4]
#
===============================================
--- ChangeLog	9d83c8952ebabe9316c0e9cee711350fdb8cc004
+++ ChangeLog	05e8ffc7a1bf3e27ca62368bd224c221014f2bab
@@ -1,3 +1,8 @@
+2005-08-09  Olivier Andrieu  <address@hidden>
+
+	* contrib/monotone.el: a couple of fixes spotted by the compiler
+	* Changelog, contrib/colorize: utf8ize
+
 2005-08-08  Nathaniel Smith  <address@hidden>

 	* configure.ac, monotone.spec, debian/changelog:
@@ -6285,7 +6290,7 @@
 	* AUTHORS: Mention Wojciech and Neil.
 	* revision.cc (calculate_ancestors_from_graph): Make non-recursive.

-2005-01-17  Wojciech MiÅkowski  <address@hidden>
+2005-01-17  Wojciech Miłkowski  <address@hidden>

 	* std_hooks.lua: Teach about meld.

===============================================
--- contrib/colorize	6d186a777205d4a1bae5b7fc7b6bf52fc6d83df5
+++ contrib/colorize	8993ffb22250247bfe0bc2c746b4a197264f3fff
@@ -5,7 +5,7 @@

 # $Id: colorize,v 1.5 2004/07/19 14:50:38 cbouvi Exp $
 #
-#  Copyright (C) 2004 Cédric Bouvier
+#  Copyright (C) 2004 Cédric Bouvier
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by the Free
@@ -178,7 +178,7 @@

 =end

-=head2 Note for Microsoft® Windows® users
+=head2 Note for Microsoft® Windows® users

 The "Dos Prompt" (F<cmd.exe>) does not support the ANSI terminal escape
 sequence. This program thus requires the module C<Win32::Console::ANSI> if it
@@ -190,8 +190,8 @@

 =head1 AUTHOR

-Copyright © 2004
+Copyright © 2004

-Cédric Bouvier <address@hidden>
+Cédric Bouvier <address@hidden>

 =cut
===============================================
--- contrib/monotone.el	dc3c1211a531746927242f54befc07788919a112
+++ contrib/monotone.el	e4dab598c21173cb6b46320982cb2f115e88cea4
@@ -199,7 +199,6 @@
 With t use `monotone-vc-prefix-map'.
 This permits quick switches between the classic vc and monotone keymaps."
   (interactive "P")
-  (message "Arg: %s" arg)
   (define-key ctl-x-map "v"
     (let ((current (lookup-key ctl-x-map "v")))
       (if (and (not (eq arg 0))
@@ -685,7 +684,7 @@
   (let ((cmds (list "log"))
         (depth monotone-log-depth))
     (when (and (numberp depth) (< 0 depth))
-      (setq cmds (append cmds (list (format "--last=%d" last)))))
+      (setq cmds (append cmds (list (format "--last=%d" depth)))))
     (monotone-cmd-buf arg cmds)
     (rename-buffer "*monotone log*" t)))
 ;; (monotone-vc-print-log)
@@ -700,9 +699,9 @@
     (diff-mode)
     (rename-buffer
      (format "*monotone diff %s*"
-             (case what
-               ('file (monotone-extract-MT-path name))
-               (t what))) t)))
+             (cond
+	      ((eq what 'file) (monotone-extract-MT-path name))
+	      (t what))) t)))

 (defun monotone-vc-register ()
   "Register this file with monotone for the next commit."
@@ -776,26 +775,26 @@
         (kill-buffer name))
       (rename-buffer name))))

-(defun monotone-cat-id-pd (what default)
+(defun monotone-cat-id-pd (what id default)
   "A helper function."
   (monotone-cat-id what (or id (monotone-id-at-point-prompt what default))))

 (defun monotone-cat-fileid (&optional id)
   "Display the file with ID."
   (interactive)
-  (monotone-cat-id-pd 'file monotone-last-fileid)
+  (monotone-cat-id-pd 'file id monotone-last-fileid)
   (setq monotone-last-fileid monotone-last-id))

 (defun monotone-cat-manifestid (&optional id)
   "Display the manifest with ID."
   (interactive)
-  (monotone-cat-id-pd 'manifest monotone-last-manifestid)
+  (monotone-cat-id-pd 'manifest id monotone-last-manifestid)
   (setq monotone-last-revisionid monotone-last-id))

 (defun monotone-cat-revisionid (&optional id)
   "Display the revision with ID."
   (interactive)
-  (monotone-cat-id-pd 'revision monotone-last-revisionid)
+  (monotone-cat-id-pd 'revision id monotone-last-revisionid)
   (setq monotone-last-revisionid monotone-last-id))

 ;;;;;;;;;;