[Emacs-diffs] emacs-26 26c58f3: Small fix for erc-logging-enabled

[Glenn Morris]

branch: emacs-26
commit 26c58f31a84b7e30110326008eb293e42edca78f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Small fix for erc-logging-enabled
    
    * lisp/erc/erc-log.el (erc-logging-enabled):
    Respect buffer-locality of erc-enable-logging variable.
---
 lisp/erc/erc-log.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 1f0cb13..babcb5f 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -321,12 +321,13 @@ If BUFFER is nil, the value of `current-buffer' is used.
 Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
 is writable (it will be created as necessary) and
 `erc-enable-logging' returns a non-nil value."
+  (or buffer (setq buffer (current-buffer)))
   (and 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)))
+          (funcall erc-enable-logging buffer)
+        (buffer-local-value 'erc-enable-logging buffer))))
 
 (defun erc-log-standardize-name (filename)
   "Make FILENAME safe to use as the name of an ERC log.