diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-12-04 18:55:29 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-12-04 18:55:29 +0100 |
commit | f8db6e0295bf522683f06469068bbf21e9a9f514 (patch) | |
tree | aafab0811a9de16cad49937e40a8e45f78320df6 | |
parent | ada2f64b168c4fea99e43233f08eca08836c66dd (diff) | |
parent | d3f7309cbdd0b27e0b496fb82464b5ec67651c7f (diff) | |
download | org-mode-f8db6e0295bf522683f06469068bbf21e9a9f514.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-irc.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/org-irc.el b/lisp/org-irc.el index bafb9ce..9fbe8df 100644 --- a/lisp/org-irc.el +++ b/lisp/org-irc.el @@ -50,18 +50,20 @@ (require 'org) -;; Declare the function form ERC that we use. +(declare-function erc-buffer-filter "erc" (predicate &optional proc)) +(declare-function erc-channel-p "erc" (channel)) +(declare-function erc-cmd-JOIN "erc" (channel &optional key)) (declare-function erc-current-logfile "erc-log" (&optional buffer)) -(declare-function erc-prompt "erc" ()) (declare-function erc-default-target "erc" ()) -(declare-function erc-channel-p "erc" (channel)) -(declare-function erc-buffer-filter "erc" (predicate &optional proc)) -(declare-function erc-server-buffer "erc" ()) (declare-function erc-get-server-nickname-list "erc" ()) -(declare-function erc-cmd-JOIN "erc" (channel &optional key)) +(declare-function erc-logging-enabled "erc-log" (&optional buffer)) +(declare-function erc-prompt "erc" ()) +(declare-function erc-save-buffer-in-logs "erc-log" (&optional buffer)) +(declare-function erc-server-buffer "erc" ()) (defvar org-irc-client 'erc "The IRC client to act on.") + (defvar org-irc-link-to-logs nil "Non-nil will store a link to the logs, nil will store an irc: style link.") |