diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/erc/erc-netsplit.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/erc/erc-netsplit.el')
| -rw-r--r-- | lisp/erc/erc-netsplit.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el index 9cfb947003c..994f2d07c30 100644 --- a/lisp/erc/erc-netsplit.el +++ b/lisp/erc/erc-netsplit.el @@ -52,7 +52,7 @@ netsplits, so that it can filter the JOIN messages on a netjoin too." (remove-hook 'erc-timer-hook #'erc-netsplit-timer))) (defcustom erc-netsplit-show-server-mode-changes-flag nil - "Set to t to enable display of server mode changes." + "Non-nil means to enable display of server mode changes." :type 'boolean) (defcustom erc-netsplit-debug nil @@ -61,8 +61,7 @@ netsplits, so that it can filter the JOIN messages on a netjoin too." (defcustom erc-netsplit-regexp "^[^ @!\"\n]+\\.[^ @!\n]+ [^ @!\n]+\\.[^ @!\"\n]+$" - "This regular expression should match quit reasons produced -by netsplits." + "This regular expression should match quit reasons produced by netsplits." :type 'regexp) (defcustom erc-netsplit-hook nil |