From 0eaae363eb96fe9f685543946606150e6649ce0d Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Sat, 30 Nov 2013 14:06:14 -0500
Subject: [PATCH] Fix various typos and problems.

---
 calendar-import.plx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/calendar-import.plx b/calendar-import.plx
index 16faaf7..0edc9af 100644
--- a/calendar-import.plx
+++ b/calendar-import.plx
@@ -160,10 +160,10 @@ END_ICAL
 ELISP_END
 ;
   $elispFH->close();
-  my @emacsOutput = read_from_process($emacsBinary, '--no-windows',
+  my @emacsOutput = read_from_process($config->{emacsBinary}, '--no-windows',
                  '--batch', '--no-site-file', '-l', $elispFile);
-  DieLog("Emacs process for exporting $privateCalendarFile and " .
-         "$publicCalendarFile exited with non-zero exit status of " .
+  DieLog("Emacs process for importing $veventFile and " .
+         "$config->{proposedDiary} exited with non-zero exit status of " .
          "$? ($!), and output of:\n    " . join("\n   ", @emacsOutput))
     if ($? != 0);
   my $goodCount =0;
@@ -183,14 +183,14 @@ sub HandleProposal ($$$) {
     ParseEventAndAddProposed($config, $file, "PROPOSED CHANGE");
   } elsif ($operation eq 'D') {
     chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
-    system($emacsSettings->{gitBinary}, 'checkout', $config->{myBranch});
+    system($config->{gitBinary}, 'checkout', $config->{myBranch});
     DieLog("Unable to checkout $config->{myBranch} branch in git") unless ($? == 0);
 
     ParseEventAndAddProposed($config, $file, "PROPOSED DELETE");
 
     # Now, reset back to incoming branch, as GenerateDiaryFromNewEvents assumes that.
     chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
-    system($emacsSettings->{gitBinary}, 'checkout', $config->{incomingBranch});
+    system($config->{gitBinary}, 'checkout', $config->{incomingBranch});
     DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0);
   } else {
     DieLog("Invalid operation of $operation for $file");
@@ -202,13 +202,13 @@ sub GenerateDiaryFromNewEvents ($) {
 
   chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
 
-  system($emacsSettings->{gitBinary}, 'checkout', $config->{incomingBranch});
+  system($config->{gitBinary}, 'checkout', $config->{incomingBranch});
   DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0);
   my @gitDiffSummaryOutput =
-    read_from_process($emacsSettings->{gitBinary}, 'diff-index', $config->{myBranch});
+    read_from_process($config->{gitBinary}, 'diff-index', $config->{myBranch});
 
   foreach my $line (@gitDiffSummaryOutput) {
-    next if $line ~= /$ENV{USER}/;   # Ignore lines that aren't for my calendar.
+    next if $line =~ /$ENV{USER}/;   # Ignore lines that aren't for my calendar.
     DieLog("odd line in diff-index output: $line") unless
       $line =~ /(A|D|M)\s+(\S+)$/;
     my($operation, $file) = ($1, $2);