Merge from origin/emacs-25

[gnu-emacs] / lisp / erc / erc-match.el

diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 0622b18ca7fa9a9e5ac9fb73bbf23b427fb541e7..1313ecc607280222c377c6e8481df3edb5f51c73 100644 (file)
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -1,6 +1,6 @@
 ;;; erc-match.el --- Highlight messages matching certain regexps
 
 ;;; erc-match.el --- Highlight messages matching certain regexps
 

-;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2016 Free Software Foundation, Inc.

 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: emacs-devel@gnu.org
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: emacs-devel@gnu.org


@@ -191,7 +191,7 @@ use for the logged message."
   "Flag specifying when matched message logging should happen.
 When nil, don't log any matched messages.
 When t, log messages.
   "Flag specifying when matched message logging should happen.
 When nil, don't log any matched messages.
 When t, log messages.

-When 'away, log messages only when away."
+When `away', log messages only when away."

   :group 'erc-match
   :type '(choice (const nil)
                 (const away)
   :group 'erc-match
   :type '(choice (const nil)
                 (const away)