diff options
| -rw-r--r-- | lisp/erc/erc-button.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-networks.el | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 1be56f5dc21..48f6a5d1794 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el | |||
| @@ -133,7 +133,7 @@ longer than `erc-fill-column'." | |||
| 133 | ("[`‘]\\([a-zA-Z][-a-zA-Z_0-9!*<=>+]+\\)['’]" | 133 | ("[`‘]\\([a-zA-Z][-a-zA-Z_0-9!*<=>+]+\\)['’]" |
| 134 | 1 t erc-button-describe-symbol 1) | 134 | 1 t erc-button-describe-symbol 1) |
| 135 | ;; pseudo links | 135 | ;; pseudo links |
| 136 | ("\\bInfo:[\"]\\([^\"]+\\)[\"]" 0 t Info-goto-node 1) | 136 | ("\\(?:\\bInfo: ?\\|(info \\)[\"]\\(([^\"]+\\)[\"])?" 0 t info 1) |
| 137 | ("\\b\\(Ward\\|Wiki\\|WardsWiki\\|TheWiki\\):\\([A-Z][a-z]+\\([A-Z][a-z]+\\)+\\)" | 137 | ("\\b\\(Ward\\|Wiki\\|WardsWiki\\|TheWiki\\):\\([A-Z][a-z]+\\([A-Z][a-z]+\\)+\\)" |
| 138 | 0 t (lambda (page) | 138 | 0 t (lambda (page) |
| 139 | (browse-url (concat "http://c2.com/cgi-bin/wiki?" page))) | 139 | (browse-url (concat "http://c2.com/cgi-bin/wiki?" page))) |
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 95fd8990c99..4337d633cfa 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el | |||
| @@ -1292,7 +1292,6 @@ shutting down the connection." | |||
| 1292 | erc-server-announced-name "\" in `erc-networks-alist'" | 1292 | erc-server-announced-name "\" in `erc-networks-alist'" |
| 1293 | " or consider calling `erc-tls' with the keyword `:id'." | 1293 | " or consider calling `erc-tls' with the keyword `:id'." |
| 1294 | " See Info:\"(erc) Network Identifier\" for more."))) | 1294 | " See Info:\"(erc) Network Identifier\" for more."))) |
| 1295 | (require 'info) | ||
| 1296 | (erc-display-error-notice parsed m) | 1295 | (erc-display-error-notice parsed m) |
| 1297 | (if erc-networks--allow-unknown-network | 1296 | (if erc-networks--allow-unknown-network |
| 1298 | (progn | 1297 | (progn |
| @@ -1514,7 +1513,6 @@ to be a false alarm. If `erc-reuse-buffers' is nil, let | |||
| 1514 | "Emit warning when the `networks' module hasn't been loaded. | 1513 | "Emit warning when the `networks' module hasn't been loaded. |
| 1515 | Ideally, do so upon opening the network process." | 1514 | Ideally, do so upon opening the network process." |
| 1516 | (unless (or erc--target erc-networks-mode) | 1515 | (unless (or erc--target erc-networks-mode) |
| 1517 | (require 'info nil t) | ||
| 1518 | (let ((m (concat "Required module `networks' not loaded. If this " | 1516 | (let ((m (concat "Required module `networks' not loaded. If this " |
| 1519 | " was unexpected, please add it to `erc-modules'."))) | 1517 | " was unexpected, please add it to `erc-modules'."))) |
| 1520 | ;; Assume the server buffer has been marked as active. | 1518 | ;; Assume the server buffer has been marked as active. |