]> git.eshelyaron.com Git - emacs.git/commitdiff
Small fix for erc-logging-enabled
authorGlenn Morris <rgm@gnu.org>
Tue, 9 Jan 2018 19:48:29 +0000 (14:48 -0500)
committerGlenn Morris <rgm@gnu.org>
Tue, 9 Jan 2018 19:48:29 +0000 (14:48 -0500)
* lisp/erc/erc-log.el (erc-logging-enabled):
Respect buffer-locality of erc-enable-logging variable.

lisp/erc/erc-log.el

index 1f0cb13c0d0daaefb70a556445c0462f7caf75f4..babcb5f68ff8f35a2ab4982822772886abb6d1b5 100644 (file)
@@ -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.