bug-reference auto-setup for IRC, implementation for ERC

* lisp/progmodes/bug-reference.el (bug-reference-setup-from-irc-alist):
Change SERVER-REGEXP to NETWORK-REGEXP in docstring.
* lisp/progmodes/bug-reference.el (bug-reference--maybe-setup-from-irc):
Change semantics from requiring a match of channel OR server to
requiring a match of both (if both are configured).
* lisp/progmodes/bug-reference.el (bug-reference-try-setup-from-erc):
New defun doing the auto-setup for ERC.
(bug-reference--run-auto-setup): Run bug-reference-try-setup-from-erc.
* etc/NEWS: Extend entry describing bug-reference auto-setup.

2 files changed, 45 insertions, 25 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 7c6c9fe2620..c93057e24dd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -566,8 +566,8 @@ appropriate values for those two variables.  There are three guessing
 mechanisms so far: based on version control information of the current
 buffer's file, based on newsgroup/mail-folder name and several news
 and mail message headers in Gnus buffers, and based on IRC channel and
-server in rcirc buffers.  All mechanisms are extensible with custom
-rules, see the variables 'bug-reference-setup-from-vc-alist',
+network in rcirc and ERC buffers.  All mechanisms are extensible with
+custom rules, see the variables 'bug-reference-setup-from-vc-alist',
 'bug-reference-setup-from-mail-alist', and
 'bug-reference-setup-from-irc-alist'.
 
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index b88ea0af82c..c52331f84fa 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -353,38 +353,45 @@ and set it if applicable."
 
 This takes action if `bug-reference-mode' is enabled in IRC
 channels using one of Emacs' IRC clients (rcirc and ERC).
-Currently, only rcirc is supported.
+Currently, rcirc and ERC are supported.
 
 Each element has the form
 
-  (CHANNEL-REGEXP SERVER-REGEXP BUG-REGEXP URL-FORMAT)
+  (CHANNEL-REGEXP NETWORK-REGEXP BUG-REGEXP URL-FORMAT)
 
-CHANNEL-REGEXP is a regexp matched against the current mail IRC
-channel name.  SERVER-REGEXP is matched against the IRC server
-name.  If any of those matches, BUG-REGEXP is set as
+CHANNEL-REGEXP is a regexp matched against the current IRC
+channel name (e.g. #emacs).  NETWORK-REGEXP is matched against
+the IRC network name (e.g. freenode).  Both entries are optional.
+If all given entries match, BUG-REGEXP is set as
 `bug-reference-bug-regexp' and URL-FORMAT is set as
 `bug-reference-url-format'.")
 
-(defun bug-reference--maybe-setup-from-irc (channel server)
-  "Set up according to IRC CHANNEL or SERVER.
-CHANNEL is an IRC channel name and SERVER is that channel's
-server name.
+(defun bug-reference--maybe-setup-from-irc (channel network)
+  "Set up according to IRC CHANNEL or NETWORK.
+CHANNEL is an IRC channel name (or generally a target, i.e., it
+could also be a user name) and NETWORK is that channel's network
+name.
 
-If any CHANNEL-REGEXP or SERVER-REGEXP of
-`bug-reference-setup-from-irc-alist' matches CHANNEL or SERVER,
-the corresponding BUG-REGEXP and URL-FORMAT are set."
+If any `bug-reference-setup-from-irc-alist' entry's
+CHANNEL-REGEXP and NETWORK-REGEXP match CHANNEL and NETWORK, the
+corresponding BUG-REGEXP and URL-FORMAT are set."
   (catch 'setup-done
     (dolist (config bug-reference-setup-from-irc-alist)
-      (when (or
-             (and channel
-                  (car config)
-                  (string-match-p (car config) channel))
-             (and server
-                  (nth 1 config)
-                  (string-match-p (car config) server)))
-        (setq-local bug-reference-bug-regexp (nth 2 config))
-        (setq-local bug-reference-url-format (nth 3 config))
-        (throw 'setup-done t)))))
+      (let ((channel-rx (car config))
+            (network-rx (nth 1 config)))
+        (when (and
+               ;; One of both has to be given.
+               (or channel-rx network-rx)
+               ;; The args have to be set.
+               channel network)
+          (when (and
+                 (or (null channel-rx)
+                     (string-match-p channel-rx channel))
+                 (or (null network-rx)
+                     (string-match-p network-rx network)))
+            (setq-local bug-reference-bug-regexp (nth 2 config))
+            (setq-local bug-reference-url-format (nth 3 config))
+            (throw 'setup-done t)))))))
 
 (defvar rcirc-target)
 (defvar rcirc-server-buffer)
@@ -402,6 +409,18 @@ and set it if applicable."
           (with-current-buffer rcirc-server-buffer
             rcirc-server)))))
 
+(declare-function erc-format-target "erc")
+(declare-function erc-network-name "erc-networks")
+
+(defun bug-reference-try-setup-from-erc ()
+  "Try setting up `bug-reference-mode' based on ERC channel and server.
+Test each configuration in `bug-reference-setup-from-irc-alist'
+and set it if applicable."
+  (when (derived-mode-p 'erc-mode)
+    (bug-reference--maybe-setup-from-irc
+     (erc-format-target)
+     (erc-network-name))))
+
 (defun bug-reference--run-auto-setup ()
   (when (or bug-reference-mode
             bug-reference-prog-mode)
@@ -414,7 +433,8 @@ and set it if applicable."
         (catch 'setup
           (dolist (f (list #'bug-reference-try-setup-from-vc
                            #'bug-reference-try-setup-from-gnus
-                           #'bug-reference-try-setup-from-rcirc))
+                           #'bug-reference-try-setup-from-rcirc
+                           #'bug-reference-try-setup-from-erc))
             (when (funcall f)
               (throw 'setup t))))))))