From d6b7654fcf87186210f02e81468d77643dd0e2e0 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 26 Jan 2012 17:08:12 -0500
Subject: [PATCH] Move cvs_keyword_subst_args() down with the other internal
 support routines.

---
 IkiWiki/Plugin/cvs.pm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 5ce3c5cbe..0a6cbfaf6 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -202,24 +202,6 @@ sub rcs_commit_staged (@) {
 	return undef # success
 }
 
-sub cvs_keyword_subst_args ($) {
-	my $file = shift;
-
-	local $CWD = $config{srcdir};
-
-	eval q{use File::MimeInfo};
-	error($@) if $@;
-	my $filemime = File::MimeInfo::default($file);
-	# if (-T $file) {
-
-	if (defined($filemime) && $filemime eq 'text/plain') {
-		return ($file);
-	}
-	else {
-		return ('-kb', $file);
-	}
-}
-
 sub rcs_add ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
@@ -497,6 +479,24 @@ sub cvs_is_controlling {
 	return (-d "$dir/CVS") ? 1 : 0;
 }
 
+sub cvs_keyword_subst_args ($) {
+	my $file = shift;
+
+	local $CWD = $config{srcdir};
+
+	eval q{use File::MimeInfo};
+	error($@) if $@;
+	my $filemime = File::MimeInfo::default($file);
+	# if (-T $file) {
+
+	if (defined($filemime) && $filemime eq 'text/plain') {
+		return ($file);
+	}
+	else {
+		return ('-kb', $file);
+	}
+}
+
 sub cvs_runcvs(@) {
 	my @cmd = @_;
 	unshift @cmd, 'cvs', '-Q';
-- 
2.26.2