Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / ikiwiki-comment.in

diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in
index 0891766ab6f154ae1f7977c49a58a7d86f44996b..174647b0611900346a705d55d6bcd4e579907c89 100755 (executable)
--- a/ikiwiki-comment.in
+++ b/ikiwiki-comment.in
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

+no lib '.';

 use warnings;
 use strict;
 use warnings;
 use strict;

-use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use FindBin; use lib $FindBin::Bin; # For use in nonstandard directory, munged by Makefile.

 use IkiWiki;
 use IkiWiki::Plugin::comments;
 use Getopt::Long;
 use IkiWiki;
 use IkiWiki::Plugin::comments;
 use Getopt::Long;


@@ -115,7 +116,7 @@ sub exec_editor {
                @editor=split(' ', $ENV{EDITOR});
        }
        if (exists $ENV{VISUAL}) {
                @editor=split(' ', $ENV{EDITOR});
        }
        if (exists $ENV{VISUAL}) {

-       @editor=split(' ', $ENV{VISUAL});
+               @editor=split(' ', $ENV{VISUAL});

        }
        exec(@editor, $file);
 }
        }
        exec(@editor, $file);
 }