aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2007-06-07 00:38:27 +0000
committerJuanma Barranquero <[email protected]>2007-06-07 00:38:27 +0000
commit680a990518ac593cb479f00faa5814fbfc916de2 (patch)
tree3b1ad30517708b16ecb8f1f55b35bf36932d498f
parentd367ab1ffd4add62851aab756807fff381f9d725 (diff)
(erc-startup-file-list): Fix typo in docstring.
-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 eec2478b16..5f283b44ee 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-07 Juanma Barranquero <[email protected]>
+
+ * erc.el (erc-startup-file-list): Fix typo in docstring.
+
2007-06-06 Juanma Barranquero <[email protected]>
* erc.el (erc-show-channel-key-p): Fix typo in docstring.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 72442de9f9..d6875ffc4a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -842,7 +842,7 @@ See `erc-server-flood-margin' for other flood-related parameters.")
The first existent and readable one will get executed.
If the filename ends with `.el' it is presumed to be an Emacs Lisp
-script and it gets (load)ed. Otherwise is is treated as a bunch of
+script and it gets (load)ed. Otherwise it is treated as a bunch of
regular IRC commands."
:group 'erc-scripts
:type '(repeat file))