don't add new exported warning function

Nothing in the po plugin actually uses this function.

The benefit of adding the function in general is debatable, but I'd
prefer to keep the changes involved in merging po at a minimum.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5df1151047ab2720099625224cc9b325ff0c5d72..66fea4369b1326903f0bce26ed019a288e12788e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -21,7 +21,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext urlto targetpage
                 add_underlay pagetitle titlepage linkpage newpagefile
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext urlto targetpage
                 add_underlay pagetitle titlepage linkpage newpagefile

-                inject warning
+                inject

                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version


@@ -579,10 +579,6 @@ sub error ($;$) {
        die $message."\n";
 }
 
        die $message."\n";
 }
 

-sub warning ($) {
-       return log_message(warning => @_);
-}
-

 sub debug ($) {
        return unless $config{verbose};
        return log_message(debug => @_);
 sub debug ($) {
        return unless $config{verbose};
        return log_message(debug => @_);

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 05dfc5d09dae984b360f79ac22da67ab3d136655..4704ba16dfb53563373bc0339272beafbf6c0ffa 100644 (file)
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -561,10 +561,6 @@ the id can be controled by the user.
 Logs a debugging message. These are supressed unless verbose mode is turned
 on.
 
 Logs a debugging message. These are supressed unless verbose mode is turned
 on.
 

-#### `warning($)`
-
-Logs a warning message.
-

 #### `error($;$)`
 
 Aborts with an error message. If the second parameter is passed, it is a
 #### `error($;$)`
 
 Aborts with an error message. If the second parameter is passed, it is a