summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-match.el
diff options
context:
space:
mode:
authorYuuki Harano <masm+github@masm11.me>2021-11-11 00:39:53 +0900
committerYuuki Harano <masm+github@masm11.me>2021-11-11 00:39:53 +0900
commit4dd1f56f29fc598a8339a345c2f8945250600602 (patch)
treeaf341efedffe027e533b1bcc0dbf270532e48285 /lisp/erc/erc-match.el
parent4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff)
parent810fa21d26453f898de9747ece7205dfe6de9d08 (diff)
downloademacs-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-match.el')
-rw-r--r--lisp/erc/erc-match.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 43fbca3e666..01d6e44d594 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -24,7 +24,7 @@
;;; Commentary:
-;; This file includes stuff to work with pattern matching in ERC. If
+;; This file includes stuff to work with pattern matching in ERC. If
;; you were used to customizing erc-fools, erc-keywords, erc-pals,
;; erc-dangerous-hosts and the like, this file contains these
;; customizable variables.
@@ -79,7 +79,7 @@ Useful to mark nicks from dangerous hosts."
:type '(repeat regexp))
(defcustom erc-current-nick-highlight-type 'keyword
- "Determines how to highlight text in which your current nickname appears
+ "Determine how to highlight text in which your current nickname appears
\(does not apply to text sent by you).
The following values are allowed:
@@ -234,9 +234,9 @@ current-nick, keyword, pal, dangerous-host, fool."
:type 'hook)
(defcustom erc-match-exclude-server-buffer nil
- "If true, don't perform match on the server buffer; this is
-useful for excluding all the things like MOTDs from the server
-and other miscellaneous functions."
+ "If true, don't perform match on the server buffer.
+This is useful for excluding all the things like MOTDs from the
+server and other miscellaneous functions."
:version "24.3"
:type 'boolean)