Merge branch 'master' into debian

2 files changed, 2 insertions, 2 deletions

diff --git a/interimap b/interimap
index a6e2d06..b714480 100755
--- a/interimap
+++ b/interimap
@@ -63,7 +63,7 @@ my $COMMAND = do {
 usage(1) if defined $COMMAND and (($COMMAND eq 'delete' and !@ARGV) or ($COMMAND eq 'rename' and $#ARGV != 1));
 usage(1) if defined $COMMAND and (defined $CONFIG{watch} or defined $CONFIG{notify});
 usage(1) if $CONFIG{target} and !(defined $COMMAND and ($COMMAND eq 'delete'or $COMMAND eq 'rename'));
-$CONFIG{watch} = $CONFIG{notify} ? 900 : 60 unless $CONFIG{watch};
+$CONFIG{watch} = $CONFIG{notify} ? 900 : 60 if (defined $CONFIG{watch} or $CONFIG{notify}) and !$CONFIG{watch};
 @ARGV = map {uc $_ eq 'INBOX' ? 'INBOX' : $_ } @ARGV; # INBOX is case-insensitive
 die "Invalid mailbox name $_" foreach grep !/\A([\x01-\x7F]+)\z/, @ARGV;
 
diff --git a/interimap.md b/interimap.md
index 9515c4a..9d55d9e 100644
--- a/interimap.md
+++ b/interimap.md
@@ -160,7 +160,7 @@ Options
 
 `--notify`
 
-:   Wether to use the [IMAP `NOTIFY` extension][RFC 5465] to instruct
+:   Whether to use the [IMAP `NOTIFY` extension][RFC 5465] to instruct
     the server to automatically send updates to the client.  (Both local
     and remote servers must support [RFC 5465] for this to work.)
     This greatly reduces IMAP traffic since `interimap` can rely on