[Erc-commit] [commit][emacs22] erc-log: Fix bug when erc-log-channels-directory is a function

[mwolson]

commit fd07e85027b187c4bf1472d93db56b610315d1d3
Author: Michael Olson <address@hidden>
Date:   Sun Jun 10 19:25:27 2007 +0000

    erc-log: Fix bug when erc-log-channels-directory is a function
    
    2007-06-10  Michael Olson  <address@hidden>
    
        * erc-log.el (erc-logging-enabled): Fix a bug that occurred when
        `erc-log-channels-directory' had the name of a function.
    git-archimport-id: address@hidden/erc--main--0--patch-148

diff --git a/ChangeLog b/ChangeLog
index ea0786e..0f6f03f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-10  Michael Olson  <address@hidden>
+
+       * erc-log.el (erc-logging-enabled): Fix a bug that occurred when
+       `erc-log-channels-directory' had the name of a function.
+
 2007-06-03  Michael Olson  <address@hidden>
 
        * erc-compat.el (erc-view-mode-enter): Make this its own function,
diff --git a/erc-log.el b/erc-log.el
index e3df528..c86ba60 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -307,7 +307,8 @@ Logging is enabled if `erc-log-channels-directory' is 
non-nil, the directory
 is writeable (it will be created as necessary) and
 `erc-enable-logging' returns a non-nil value."
   (and erc-log-channels-directory
-       (erc-directory-writable-p erc-log-channels-directory)
+       (or (functionp erc-log-channels-directory)
+          (erc-directory-writable-p erc-log-channels-directory))
        (if (functionp erc-enable-logging)
           (funcall erc-enable-logging (or buffer (current-buffer)))
         erc-enable-logging)))