Permalink
Browse files

Merge branch 'master' of github.com:ingydotnet/mo-pm

Conflicts:
	lib/Mo/import.pm
  • Loading branch information...
2 parents 1bf91bc + bce0a42 commit 854fd28a6540220ddedce1feddee0a7361749ad1 @ingydotnet committed Oct 3, 2011
Showing with 4 additions and 1 deletion.
  1. +3 −0 lib/Mo/Golf.pm
  2. +1 −1 lib/Mo/import.pm
View
@@ -76,6 +76,9 @@ sub _finder_subs {
duplicate_whitespace => sub {
my ( $top, $current ) = @_;
return 0 if !$current->isa( tok 'Whitespace' );
+
+ $current->set_content(' ') if 1 < length $current->content;
+
return 0 if !$current->next_token;
return 0 if !$current->next_token->isa( tok 'Whitespace' );
return 1;
View
@@ -1,3 +1,3 @@
package Mo::import;my$M="Mo::";
$VERSION=0.26;
-my$i=\&import;*{$M.import}=sub{(@_==2 and not $_[1])?pop@_:@_==1 ?push@_,grep!/import/,@f:();goto&$i};
+my$i=\&import;*{$M.import}=sub{(@_==2 and not $_[1])?pop@_:@_==1 ?push@_,grep!/import/,@f:();goto&$i};

0 comments on commit 854fd28

Please sign in to comment.