summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 70ffa4ede48..eec2478b162 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-06 Juanma Barranquero <lekktu@gmail.com>
+
+ * erc.el (erc-show-channel-key-p): Fix typo in docstring.
+
2007-04-01 Michael Olson <mwolson@gnu.org>
* erc.el (erc-version-string): Release ERC 5.2.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 37c2c2e0883..72442de9f95 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5756,7 +5756,7 @@ Otherwise, use the `erc-header-line' face."
(function :tag "Call a function")))
(defcustom erc-show-channel-key-p t
- "Show the the channel key in the header line."
+ "Show the channel key in the header line."
:group 'erc-paranoia
:type 'boolean)