diff options
| author | F. Jason Park <jp@neverwas.me> | 2022-12-18 19:01:40 -0800 |
|---|---|---|
| committer | F. Jason Park <jp@neverwas.me> | 2023-04-08 14:23:51 -0700 |
| commit | 1f1cd467c6afc8100a338e9b44bae8cebfa093f6 (patch) | |
| tree | 8a838517fd3be52645d25b8b9d3f8a139259f0e7 | |
| parent | 4b56739547c93598d420c44dc7ae89129ccd912a (diff) | |
| download | emacs-1f1cd467c6afc8100a338e9b44bae8cebfa093f6.tar.gz | |
Replace Info-goto-node with info in erc-button-alist
* lisp/erc/erc-button.el (erc-button-alist): Replace `Info-goto-node'
with plain `info', which is autoloaded. Expand regexp to recognize
inline `info' function calls.
* lisp/erc/erc-networks.el (erc-networks--set-name,
erc-networks--warn-on-connect): Don't require `info'. (Bug#60933.)
| -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'." ("[`‘]\\([a-zA-Z][-a-zA-Z_0-9!*<=>+]+\\)['’]" 1 t erc-button-describe-symbol 1) ;; pseudo links - ("\\bInfo:[\"]\\([^\"]+\\)[\"]" 0 t Info-goto-node 1) + ("\\(?:\\bInfo: ?\\|(info \\)[\"]\\(([^\"]+\\)[\"])?" 0 t info 1) ("\\b\\(Ward\\|Wiki\\|WardsWiki\\|TheWiki\\):\\([A-Z][a-z]+\\([A-Z][a-z]+\\)+\\)" 0 t (lambda (page) (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." erc-server-announced-name "\" in `erc-networks-alist'" " or consider calling `erc-tls' with the keyword `:id'." " See Info:\"(erc) Network Identifier\" for more."))) - (require 'info) (erc-display-error-notice parsed m) (if erc-networks--allow-unknown-network (progn @@ -1514,7 +1513,6 @@ to be a false alarm. If `erc-reuse-buffers' is nil, let "Emit warning when the `networks' module hasn't been loaded. Ideally, do so upon opening the network process." (unless (or erc--target erc-networks-mode) - (require 'info nil t) (let ((m (concat "Required module `networks' not loaded. If this " " was unexpected, please add it to `erc-modules'."))) ;; Assume the server buffer has been marked as active. |